From 8abe09f3b00fd31d1af24d3038f881034506d651 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 5 Mar 2021 10:08:21 +0900 Subject: Imported Upstream version 1.19.3 --- .tarball-version | 2 +- .version | 2 +- COPYING | 8 +- ChangeLog | 131 + GNUmakefile | 4 +- MAILING-LIST | 18 +- Makefile.am | 6 +- Makefile.in | 110 +- NEWS | 17 +- README | 6 +- aclocal.m4 | 85 +- build-aux/announce-gen | 12 +- build-aux/ar-lib | 270 - build-aux/build_info.pl | 2 +- build-aux/compile | 9 +- build-aux/config.guess | 118 +- build-aux/config.rpath | 2 +- build-aux/config.sub | 67 +- build-aux/depcomp | 41 +- build-aux/git-version-gen | 21 +- build-aux/gitlog-to-changelog | 8 +- build-aux/gnupload | 10 +- build-aux/install-sh | 20 +- build-aux/ltmain.sh | 9661 -------------------- build-aux/mdate-sh | 10 +- build-aux/missing | 6 +- build-aux/snippet/_Noreturn.h | 10 - build-aux/snippet/arg-nonnull.h | 26 - build-aux/snippet/c++defs.h | 316 - build-aux/snippet/unused-parameter.h | 36 - build-aux/snippet/warn-on-use.h | 109 - build-aux/test-driver | 6 +- build-aux/texinfo.tex | 268 +- build-aux/update-copyright | 11 +- build-aux/useless-if-before-free | 8 +- build-aux/vc-list-files | 10 +- configure | 3627 +++++--- configure.ac | 4 +- doc/Makefile.am | 4 +- doc/Makefile.in | 98 +- doc/fdl.texi | 2 +- doc/stamp-vti | 8 +- doc/texi2pod.pl | 4 +- doc/version.texi | 8 +- doc/wget.info | 122 +- doc/wget.texi | 5 +- lib/Makefile.am | 250 +- lib/Makefile.in | 488 +- lib/_Noreturn.h | 10 + lib/accept.c | 4 +- lib/alloca.in.h | 4 +- lib/arg-nonnull.h | 26 + lib/arpa_inet.in.h | 4 +- lib/array-mergesort.h | 4 +- lib/asnprintf.c | 4 +- lib/asprintf.c | 4 +- lib/base32.c | 6 +- lib/base32.h | 4 +- lib/basename-lgpl.c | 4 +- lib/basename.c | 4 +- lib/binary-io.c | 35 +- lib/binary-io.h | 40 +- lib/bind.c | 4 +- lib/btowc.c | 4 +- lib/c++defs.h | 316 + lib/c-ctype.h | 4 +- lib/c-strcase.h | 4 +- lib/c-strcasecmp.c | 4 +- lib/c-strcaseeq.h | 4 +- lib/c-strcasestr.c | 4 +- lib/c-strcasestr.h | 4 +- lib/c-strncasecmp.c | 4 +- lib/cloexec.c | 6 +- lib/cloexec.h | 6 +- lib/close.c | 8 +- lib/config.charset | 4 +- lib/connect.c | 4 +- lib/dirname-lgpl.c | 4 +- lib/dirname.c | 4 +- lib/dirname.h | 4 +- lib/dosname.h | 4 +- lib/dup-safer-flag.c | 4 +- lib/dup-safer.c | 4 +- lib/dup2.c | 50 +- lib/errno.in.h | 4 +- lib/error.c | 27 +- lib/error.h | 4 +- lib/exitfail.c | 4 +- lib/exitfail.h | 4 +- lib/fatal-signal.c | 4 +- lib/fatal-signal.h | 4 +- lib/fcntl.c | 10 +- lib/fcntl.in.h | 9 +- lib/fd-hook.c | 6 +- lib/fd-hook.h | 6 +- lib/fd-safer-flag.c | 4 +- lib/fd-safer.c | 4 +- lib/filename.h | 54 + lib/flexmember.h | 23 +- lib/float+.h | 4 +- lib/float.c | 4 +- lib/float.in.h | 10 +- lib/flock.c | 14 +- lib/fnmatch.c | 12 +- lib/fnmatch.in.h | 4 +- lib/fnmatch_loop.c | 12 +- lib/fopen.c | 4 +- lib/fseek.c | 4 +- lib/fseeko.c | 8 +- lib/fstat.c | 72 +- lib/ftell.c | 4 +- lib/ftello.c | 4 +- lib/futimens.c | 4 +- lib/gai_strerror.c | 4 +- lib/getaddrinfo.c | 6 +- lib/getdelim.c | 6 +- lib/getdtablesize.c | 17 +- lib/getgroups.c | 4 +- lib/getline.c | 4 +- lib/getopt-cdefs.in.h | 67 + lib/getopt-core.h | 96 + lib/getopt-ext.h | 77 + lib/getopt-pfx-core.h | 59 + lib/getopt-pfx-ext.h | 71 + lib/getopt.c | 1470 +-- lib/getopt.in.h | 258 +- lib/getopt1.c | 179 +- lib/getopt_int.h | 91 +- lib/getpass.c | 4 +- lib/getpass.h | 4 +- lib/getpeername.c | 4 +- lib/getprogname.c | 22 +- lib/getprogname.h | 4 +- lib/getsockname.c | 4 +- lib/gettext.h | 12 +- lib/gettime.c | 4 +- lib/gettimeofday.c | 158 +- lib/gl_openssl.h | 4 +- lib/glthread/lock.c | 6 +- lib/glthread/lock.h | 10 +- lib/glthread/threadlib.c | 4 +- lib/group-member.c | 4 +- lib/hard-locale.c | 4 +- lib/hard-locale.h | 4 +- lib/iconv.in.h | 4 +- lib/inet_ntop.c | 4 +- lib/intprops.h | 81 +- lib/inttypes.in.h | 4 +- lib/ioctl.c | 10 +- lib/iswblank.c | 4 +- lib/itold.c | 4 +- lib/langinfo.in.h | 4 +- lib/limits.in.h | 15 +- lib/link.c | 4 +- lib/listen.c | 4 +- lib/localcharset.c | 14 +- lib/localcharset.h | 4 +- lib/locale.in.h | 4 +- lib/localeconv.c | 4 +- lib/localtime-buffer.c | 58 + lib/localtime-buffer.h | 27 + lib/lseek.c | 10 +- lib/lstat.c | 43 +- lib/malloc.c | 4 +- lib/malloca.c | 159 + lib/malloca.h | 128 + lib/malloca.valgrind | 7 + lib/mbchar.c | 4 +- lib/mbchar.h | 4 +- lib/mbiter.h | 4 +- lib/mbrtowc.c | 17 +- lib/mbsinit.c | 38 +- lib/mbsrtowcs-impl.h | 4 +- lib/mbsrtowcs-state.c | 6 +- lib/mbsrtowcs.c | 4 +- lib/mbtowc-impl.h | 4 +- lib/mbtowc.c | 4 +- lib/md2.c | 4 +- lib/md2.h | 4 +- lib/md4.c | 4 +- lib/md4.h | 4 +- lib/md5.c | 16 +- lib/md5.h | 15 +- lib/memchr.c | 4 +- lib/memrchr.c | 4 +- lib/minmax.h | 4 +- lib/mkdir.c | 4 +- lib/mkostemp.c | 4 +- lib/mkstemp.c | 4 +- lib/mktime-internal.h | 4 +- lib/mktime.c | 70 +- lib/msvc-inval.c | 4 +- lib/msvc-inval.h | 8 +- lib/msvc-nothrow.c | 8 +- lib/msvc-nothrow.h | 4 +- lib/nanosleep.c | 4 +- lib/netdb.in.h | 4 +- lib/netinet_in.in.h | 4 +- lib/nl_langinfo.c | 4 +- lib/open.c | 33 +- lib/pathmax.h | 6 +- lib/pipe-safer.c | 4 +- lib/pipe.c | 4 +- lib/pipe2-safer.c | 4 +- lib/pipe2.c | 4 +- lib/printf-args.c | 4 +- lib/printf-args.h | 4 +- lib/printf-parse.c | 4 +- lib/printf-parse.h | 4 +- lib/quote.h | 4 +- lib/quotearg.c | 40 +- lib/quotearg.h | 4 +- lib/raise.c | 8 +- lib/rawmemchr.c | 4 +- lib/recv.c | 4 +- lib/ref-add.sin | 4 +- lib/ref-del.sin | 4 +- lib/regcomp.c | 43 +- lib/regex.c | 4 +- lib/regex.h | 4 +- lib/regex_internal.c | 63 +- lib/regex_internal.h | 35 +- lib/regexec.c | 234 +- lib/sched.in.h | 13 +- lib/secure_getenv.c | 4 +- lib/select.c | 10 +- lib/send.c | 4 +- lib/setsockopt.c | 4 +- lib/sha1.c | 16 +- lib/sha1.h | 15 +- lib/sha256.c | 16 +- lib/sha256.h | 15 +- lib/sha512.c | 16 +- lib/sha512.h | 15 +- lib/sig-handler.h | 4 +- lib/sigaction.c | 4 +- lib/signal.in.h | 8 +- lib/sigprocmask.c | 4 +- lib/size_max.h | 4 +- lib/snprintf.c | 4 +- lib/socket.c | 4 +- lib/sockets.c | 10 +- lib/sockets.h | 16 +- lib/spawn-pipe.c | 9 +- lib/spawn-pipe.h | 4 +- lib/spawn.c | 4 +- lib/spawn.in.h | 4 +- lib/spawn_faction_addclose.c | 4 +- lib/spawn_faction_adddup2.c | 4 +- lib/spawn_faction_addopen.c | 4 +- lib/spawn_faction_destroy.c | 4 +- lib/spawn_faction_init.c | 4 +- lib/spawn_int.h | 4 +- lib/spawnattr_destroy.c | 4 +- lib/spawnattr_init.c | 4 +- lib/spawnattr_setflags.c | 4 +- lib/spawnattr_setsigmask.c | 4 +- lib/spawni.c | 4 +- lib/spawnp.c | 4 +- lib/stat-time.h | 75 +- lib/stat-w32.c | 421 + lib/stat-w32.h | 37 + lib/stat.c | 419 +- lib/stdalign.in.h | 8 +- lib/stdbool.in.h | 10 +- lib/stddef.in.h | 22 +- lib/stdint.in.h | 47 +- lib/stdio-impl.h | 16 +- lib/stdio-write.c | 10 +- lib/stdio.in.h | 12 +- lib/stdlib.in.h | 25 +- lib/str-two-way.h | 8 +- lib/strcasecmp.c | 4 +- lib/strchrnul.c | 4 +- lib/strdup.c | 4 +- lib/streq.h | 4 +- lib/strerror-override.c | 4 +- lib/strerror-override.h | 4 +- lib/strerror.c | 4 +- lib/strerror_r.c | 136 +- lib/string.in.h | 21 +- lib/strings.in.h | 4 +- lib/stripslash.c | 4 +- lib/strncasecmp.c | 4 +- lib/strndup.c | 4 +- lib/strnlen.c | 4 +- lib/strnlen1.c | 4 +- lib/strnlen1.h | 4 +- lib/strpbrk.c | 4 +- lib/strptime.c | 4 +- lib/strtok_r.c | 4 +- lib/strtol.c | 4 +- lib/strtoll.c | 4 +- lib/symlink.c | 4 +- lib/sys_file.in.h | 4 +- lib/sys_ioctl.in.h | 5 +- lib/sys_select.in.h | 4 +- lib/sys_socket.in.h | 17 +- lib/sys_stat.in.h | 182 +- lib/sys_time.in.h | 4 +- lib/sys_types.in.h | 46 +- lib/sys_uio.in.h | 4 +- lib/sys_wait.in.h | 4 +- lib/tempname.c | 7 +- lib/tempname.h | 4 +- lib/time.in.h | 61 +- lib/time_r.c | 4 +- lib/timegm.c | 4 +- lib/timespec.h | 34 +- lib/tmpdir.c | 4 +- lib/tmpdir.h | 4 +- lib/u64.h | 4 +- lib/unicase.in.h | 4 +- lib/unicase/cased.c | 4 +- lib/unicase/cased.h | 18 +- lib/unicase/caseprop.h | 4 +- lib/unicase/context.h | 4 +- lib/unicase/empty-prefix-context.c | 4 +- lib/unicase/empty-suffix-context.c | 4 +- lib/unicase/ignorable.c | 4 +- lib/unicase/ignorable.h | 48 +- lib/unicase/simple-mapping.h | 4 +- lib/unicase/special-casing-table.gperf | 2 +- lib/unicase/special-casing-table.h | 262 +- lib/unicase/special-casing.c | 6 +- lib/unicase/special-casing.h | 61 - lib/unicase/special-casing.in.h | 61 + lib/unicase/tolower.c | 4 +- lib/unicase/tolower.h | 46 +- lib/unicase/u-casemap.h | 4 +- lib/unicase/u8-casemap.c | 6 +- lib/unicase/u8-tolower.c | 6 +- lib/unicase/unicasemap.h | 4 +- lib/unictype.in.h | 9 +- lib/unictype/bitmap.h | 4 +- lib/unictype/combiningclass.c | 4 +- lib/unictype/combiningclass.h | 74 +- lib/unictype/pr_soft_dotted.c | 4 +- lib/unictype/pr_soft_dotted.h | 2 +- lib/uninorm.in.h | 4 +- lib/uninorm/decompose-internal.c | 4 +- lib/uninorm/decompose-internal.h | 4 +- lib/uninorm/normalize-internal.h | 4 +- lib/uninorm/u-normalize-internal.h | 4 +- lib/uninorm/u8-normalize.c | 4 +- lib/unistd--.h | 4 +- lib/unistd-safer.h | 4 +- lib/unistd.in.h | 77 +- lib/unistr.in.h | 8 +- lib/unistr/u-cpy.h | 4 +- lib/unistr/u8-cpy.c | 4 +- lib/unistr/u8-mbtouc-unsafe-aux.c | 4 +- lib/unistr/u8-mbtouc-unsafe.c | 4 +- lib/unistr/u8-strlen.c | 4 +- lib/unistr/u8-uctomb-aux.c | 16 +- lib/unistr/u8-uctomb.c | 4 +- lib/unitypes.in.h | 4 +- lib/uniwidth.in.h | 4 +- lib/uniwidth/cjk.h | 4 +- lib/uniwidth/width.c | 50 +- lib/unlink.c | 4 +- lib/unlocked-io.h | 4 +- lib/unused-parameter.h | 36 + lib/utime.c | 256 + lib/utime.in.h | 88 + lib/utimens.c | 129 +- lib/utimens.h | 4 +- lib/vasnprintf.c | 53 +- lib/vasnprintf.h | 4 +- lib/vasprintf.c | 4 +- lib/verify.h | 4 +- lib/vsnprintf.c | 4 +- lib/w32sock.h | 10 +- lib/w32spawn.h | 10 +- lib/wait-process.c | 12 +- lib/wait-process.h | 4 +- lib/waitpid.c | 4 +- lib/warn-on-use.h | 109 + lib/wchar.in.h | 55 +- lib/wcrtomb.c | 4 +- lib/wctype.in.h | 26 +- lib/wcwidth.c | 4 +- lib/write.c | 14 +- lib/xalloc-die.c | 4 +- lib/xalloc-oversized.h | 6 +- lib/xalloc.h | 6 +- lib/xmalloc.c | 4 +- lib/xmemdup0.c | 4 +- lib/xmemdup0.h | 4 +- lib/xsize.h | 4 +- lib/xstrndup.c | 4 +- lib/xstrndup.h | 4 +- m4/00gnulib.m4 | 2 +- m4/absolute-header.m4 | 2 +- m4/alloca.m4 | 6 +- m4/arpa_inet_h.m4 | 2 +- m4/asm-underscore.m4 | 2 +- m4/base32.m4 | 2 +- m4/btowc.m4 | 18 +- m4/builtin-expect.m4 | 2 +- m4/clock_time.m4 | 2 +- m4/close.m4 | 14 +- m4/configmake.m4 | 2 +- m4/dirname.m4 | 2 +- m4/double-slash-root.m4 | 2 +- m4/dup2.m4 | 2 +- m4/eealloc.m4 | 2 +- m4/environ.m4 | 2 +- m4/errno_h.m4 | 2 +- m4/error.m4 | 2 +- m4/exponentd.m4 | 2 +- m4/extensions.m4 | 14 +- m4/extern-inline.m4 | 10 +- m4/fatal-signal.m4 | 2 +- m4/fcntl-o.m4 | 13 +- m4/fcntl.m4 | 2 +- m4/fcntl_h.m4 | 2 +- m4/flexmember.m4 | 9 +- m4/float_h.m4 | 36 +- m4/flock.m4 | 2 +- m4/fnmatch.m4 | 2 +- m4/fopen.m4 | 10 +- m4/fseek.m4 | 2 +- m4/fseeko.m4 | 11 +- m4/fstat.m4 | 29 +- m4/ftell.m4 | 2 +- m4/ftello.m4 | 26 +- m4/futimens.m4 | 8 +- m4/getaddrinfo.m4 | 2 +- m4/getdelim.m4 | 8 +- m4/getdtablesize.m4 | 56 +- m4/getgroups.m4 | 22 +- m4/getline.m4 | 8 +- m4/getopt.m4 | 31 +- m4/getpass.m4 | 2 +- m4/getprogname.m4 | 2 +- m4/gettime.m4 | 2 +- m4/gettimeofday.m4 | 48 +- m4/gl-openssl.m4 | 2 +- m4/glibc21.m4 | 2 +- m4/gnulib-common.m4 | 21 +- m4/gnulib-comp.m4 | 117 +- m4/group-member.m4 | 2 +- m4/hard-locale.m4 | 2 +- m4/host-cpu-c-abi.m4 | 369 + m4/hostent.m4 | 2 +- m4/iconv.m4 | 35 +- m4/iconv_h.m4 | 2 +- m4/include_next.m4 | 7 +- m4/inet_ntop.m4 | 7 +- m4/inline.m4 | 2 +- m4/intmax_t.m4 | 2 +- m4/inttypes-pri.m4 | 2 +- m4/inttypes.m4 | 2 +- m4/inttypes_h.m4 | 2 +- m4/ioctl.m4 | 9 +- m4/iswblank.m4 | 2 +- m4/langinfo_h.m4 | 2 +- m4/largefile.m4 | 23 +- m4/lib-ld.m4 | 163 +- m4/lib-link.m4 | 2 +- m4/lib-prefix.m4 | 129 +- m4/libunistring-base.m4 | 2 +- m4/libunistring-optional.m4 | 2 +- m4/libunistring.m4 | 2 +- m4/limits-h.m4 | 2 +- m4/link.m4 | 12 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 29 +- m4/locale-ja.m4 | 39 +- m4/locale-zh.m4 | 39 +- m4/locale_h.m4 | 6 +- m4/localeconv.m4 | 2 +- m4/localtime-buffer.m4 | 21 + m4/lock.m4 | 2 +- m4/longlong.m4 | 2 +- m4/lseek.m4 | 2 +- m4/lstat.m4 | 15 +- m4/malloc.m4 | 8 +- m4/malloca.m4 | 15 + m4/mbchar.m4 | 2 +- m4/mbiter.m4 | 2 +- m4/mbrtowc.m4 | 27 +- m4/mbsinit.m4 | 2 +- m4/mbsrtowcs.m4 | 2 +- m4/mbstate_t.m4 | 2 +- m4/mbtowc.m4 | 2 +- m4/md4.m4 | 2 +- m4/md5.m4 | 2 +- m4/memchr.m4 | 33 +- m4/memrchr.m4 | 2 +- m4/minmax.m4 | 2 +- m4/mkdir.m4 | 31 +- m4/mkostemp.m4 | 2 +- m4/mkstemp.m4 | 14 +- m4/mktime.m4 | 71 +- m4/mmap-anon.m4 | 2 +- m4/mode_t.m4 | 2 +- m4/msvc-inval.m4 | 2 +- m4/msvc-nothrow.m4 | 2 +- m4/multiarch.m4 | 2 +- m4/nanosleep.m4 | 6 +- m4/netdb_h.m4 | 2 +- m4/netinet_in_h.m4 | 2 +- m4/nl_langinfo.m4 | 2 +- m4/nocrash.m4 | 2 +- m4/off_t.m4 | 2 +- m4/open-cloexec.m4 | 21 + m4/open.m4 | 8 +- m4/pathmax.m4 | 2 +- m4/pipe.m4 | 2 +- m4/pipe2.m4 | 2 +- m4/posix_spawn.m4 | 22 +- m4/printf.m4 | 230 +- m4/pthread_rwlock_rdlock.m4 | 2 +- m4/quote.m4 | 2 +- m4/quotearg.m4 | 2 +- m4/raise.m4 | 14 +- m4/rawmemchr.m4 | 2 +- m4/regex.m4 | 31 +- m4/sched_h.m4 | 24 +- m4/secure_getenv.m4 | 2 +- m4/select.m4 | 12 +- m4/servent.m4 | 2 +- m4/sha1.m4 | 2 +- m4/sha256.m4 | 2 +- m4/sha512.m4 | 2 +- m4/sig_atomic_t.m4 | 2 +- m4/sigaction.m4 | 2 +- m4/signal_h.m4 | 2 +- m4/signalblocking.m4 | 2 +- m4/sigpipe.m4 | 2 +- m4/size_max.m4 | 2 +- m4/snprintf.m4 | 2 +- m4/socketlib.m4 | 2 +- m4/sockets.m4 | 2 +- m4/socklen.m4 | 2 +- m4/sockpfaf.m4 | 2 +- m4/spawn-pipe.m4 | 2 +- m4/spawn_h.m4 | 2 +- m4/ssize_t.m4 | 2 +- m4/stat-time.m4 | 2 +- m4/stat.m4 | 111 +- m4/stdalign.m4 | 8 +- m4/stdbool.m4 | 6 +- m4/stddef_h.m4 | 2 +- m4/stdint.m4 | 110 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 2 +- m4/stdlib_h.m4 | 14 +- m4/strcase.m4 | 2 +- m4/strchrnul.m4 | 2 +- m4/strdup.m4 | 2 +- m4/strerror.m4 | 22 +- m4/strerror_r.m4 | 28 +- m4/string_h.m4 | 16 +- m4/strings_h.m4 | 2 +- m4/strndup.m4 | 2 +- m4/strnlen.m4 | 2 +- m4/strpbrk.m4 | 2 +- m4/strptime.m4 | 2 +- m4/strtok_r.m4 | 19 +- m4/strtoll.m4 | 2 +- m4/symlink.m4 | 12 +- m4/sys_file_h.m4 | 2 +- m4/sys_ioctl_h.m4 | 2 +- m4/sys_select_h.m4 | 2 +- m4/sys_socket_h.m4 | 2 +- m4/sys_stat_h.m4 | 20 +- m4/sys_time_h.m4 | 5 +- m4/sys_types_h.m4 | 19 +- m4/sys_uio_h.m4 | 2 +- m4/sys_wait_h.m4 | 2 +- m4/tempname.m4 | 2 +- m4/threadlib.m4 | 12 +- m4/time_h.m4 | 14 +- m4/time_r.m4 | 2 +- m4/timegm.m4 | 8 +- m4/timespec.m4 | 2 +- m4/tm_gmtoff.m4 | 2 +- m4/tmpdir.m4 | 2 +- m4/unistd-safer.m4 | 2 +- m4/unistd_h.m4 | 12 +- m4/unlink.m4 | 6 +- m4/unlocked-io.m4 | 2 +- m4/utimbuf.m4 | 39 - m4/utime.m4 | 26 + m4/utime_h.m4 | 59 + m4/utimens.m4 | 5 +- m4/utimes.m4 | 24 +- m4/vasnprintf.m4 | 2 +- m4/vasprintf.m4 | 2 +- m4/vsnprintf.m4 | 2 +- m4/wait-process.m4 | 2 +- m4/waitpid.m4 | 2 +- m4/warn-on-use.m4 | 2 +- m4/wchar_h.m4 | 17 +- m4/wchar_t.m4 | 2 +- m4/wcrtomb.m4 | 6 +- m4/wctype_h.m4 | 9 +- m4/wcwidth.m4 | 25 +- m4/wget.m4 | 4 +- m4/wint_t.m4 | 16 +- m4/write.m4 | 14 +- m4/xalloc.m4 | 2 +- m4/xsize.m4 | 2 +- m4/xstrndup.m4 | 2 +- maint.mk | 22 +- po/POTFILES.in | 4 +- po/be.gmo | Bin 22931 -> 22866 bytes po/be.po | 1208 ++- po/bg.gmo | Bin 10160 -> 10201 bytes po/bg.po | 1146 ++- po/ca.gmo | Bin 38311 -> 37315 bytes po/ca.po | 1187 ++- po/cs.gmo | Bin 81639 -> 80479 bytes po/cs.po | 1156 ++- po/da.gmo | Bin 24324 -> 23431 bytes po/da.po | 1207 ++- po/de.gmo | Bin 84031 -> 82916 bytes po/de.po | 1156 ++- po/el.gmo | Bin 10774 -> 10815 bytes po/el.po | 1154 ++- po/en_GB.gmo | Bin 8365 -> 8406 bytes po/en_GB.po | 1152 ++- po/eo.gmo | Bin 70620 -> 69552 bytes po/eo.po | 1188 ++- po/es.gmo | Bin 73584 -> 72487 bytes po/es.po | 1196 ++- po/et.gmo | Bin 74296 -> 73291 bytes po/et.po | 1156 ++- po/eu.gmo | Bin 9912 -> 9953 bytes po/eu.po | 1162 ++- po/fi.gmo | Bin 63485 -> 62429 bytes po/fi.po | 1188 ++- po/fr.gmo | Bin 82266 -> 81024 bytes po/fr.po | 1156 ++- po/ga.gmo | Bin 78400 -> 77246 bytes po/ga.po | 1156 ++- po/gl.gmo | Bin 22576 -> 21501 bytes po/gl.po | 1193 ++- po/he.gmo | Bin 7130 -> 7171 bytes po/he.po | 1146 ++- po/hr.gmo | Bin 80063 -> 78957 bytes po/hr.po | 1156 ++- po/hu.gmo | Bin 76643 -> 75448 bytes po/hu.po | 1190 ++- po/id.gmo | Bin 34552 -> 33538 bytes po/id.po | 1188 ++- po/it.gmo | Bin 81610 -> 80518 bytes po/it.po | 1156 ++- po/ja.gmo | Bin 85862 -> 84578 bytes po/ja.po | 1156 ++- po/lt.gmo | Bin 15645 -> 15581 bytes po/lt.po | 1207 ++- po/nb.gmo | Bin 76922 -> 75789 bytes po/nb.po | 1156 ++- po/nl.gmo | Bin 65608 -> 64526 bytes po/nl.po | 1195 ++- po/pl.gmo | Bin 79415 -> 78336 bytes po/pl.po | 1156 ++- po/pt.gmo | Bin 15894 -> 15829 bytes po/pt.po | 1195 ++- po/pt_BR.gmo | Bin 80580 -> 79464 bytes po/pt_BR.po | 1164 ++- po/ro.gmo | Bin 8713 -> 8754 bytes po/ro.po | 1152 ++- po/ru.gmo | Bin 97594 -> 96123 bytes po/ru.po | 1156 ++- po/sk.gmo | Bin 78767 -> 77699 bytes po/sk.po | 1156 ++- po/sl.gmo | Bin 24969 -> 24055 bytes po/sl.po | 1210 ++- po/sr.gmo | Bin 97005 -> 95683 bytes po/sr.po | 1156 ++- po/sv.gmo | Bin 77241 -> 76186 bytes po/sv.po | 1156 ++- po/tr.gmo | Bin 78023 -> 76856 bytes po/tr.po | 1156 ++- po/uk.gmo | Bin 98059 -> 96583 bytes po/uk.po | 1162 ++- po/vi.gmo | Bin 84297 -> 83075 bytes po/vi.po | 1156 ++- po/wget.pot | 1124 ++- po/zh_CN.gmo | Bin 71494 -> 72246 bytes po/zh_CN.po | 1203 ++- po/zh_TW.gmo | Bin 12845 -> 12783 bytes po/zh_TW.po | 1179 ++- src/Makefile.am | 4 +- src/Makefile.in | 98 +- src/config.h.in | 164 +- src/connect.c | 4 +- src/connect.h | 4 +- src/convert.c | 4 +- src/convert.h | 4 +- src/cookies.c | 3 +- src/cookies.h | 3 +- src/css-tokens.h | 2 +- src/css-url.c | 4 +- src/css-url.h | 2 +- src/css.c | 244 +- src/css.l | 2 +- src/css_.c | 244 +- src/exits.c | 3 +- src/exits.h | 3 +- src/ftp-basic.c | 5 +- src/ftp-ls.c | 4 +- src/ftp-opie.c | 3 +- src/ftp.c | 5 +- src/ftp.h | 4 +- src/gnutls.c | 3 +- src/hash.c | 3 +- src/hash.h | 4 +- src/host.c | 21 +- src/host.h | 4 +- src/hsts.c | 4 +- src/hsts.h | 4 +- src/html-parse.c | 3 +- src/html-parse.h | 3 +- src/html-url.c | 4 +- src/html-url.h | 2 +- src/http-ntlm.c | 3 +- src/http-ntlm.h | 4 +- src/http.c | 67 +- src/http.h | 3 +- src/init.c | 5 +- src/init.h | 4 +- src/iri.c | 3 +- src/iri.h | 3 +- src/log.c | 11 +- src/log.h | 3 +- src/main.c | 27 +- src/metalink.c | 2 +- src/metalink.h | 2 +- src/mswindows.c | 5 +- src/mswindows.h | 4 +- src/netrc.c | 13 +- src/netrc.h | 4 +- src/openssl.c | 32 +- src/options.h | 4 +- src/progress.c | 3 +- src/progress.h | 3 +- src/ptimer.c | 3 +- src/ptimer.h | 3 +- src/recur.c | 4 +- src/recur.h | 4 +- src/res.c | 4 +- src/res.h | 4 +- src/retr.c | 5 +- src/retr.h | 4 +- src/ssl.h | 3 +- src/sysdep.h | 4 +- src/test.c | 3 +- src/test.h | 3 +- src/url.c | 48 +- src/url.h | 4 +- src/utils.c | 11 +- src/utils.h | 4 +- src/version.h | 2 +- src/warc.c | 2 +- src/wget.h | 4 +- src/xattr.c | 2 +- src/xattr.h | 2 +- testenv/Makefile.am | 3 +- testenv/Makefile.in | 101 +- testenv/Test-416.py | 53 + testenv/conf/__pycache__/__init__.cpython-34.pyc | Bin 1484 -> 0 bytes testenv/conf/__pycache__/__init__.cpython-34.pyo | Bin 1484 -> 0 bytes .../conf/__pycache__/__init__.cpython-35.opt-1.pyc | Bin 1481 -> 0 bytes testenv/conf/__pycache__/__init__.cpython-35.pyc | Bin 1481 -> 0 bytes .../conf/__pycache__/__init__.cpython-36.opt-1.pyc | Bin 1380 -> 0 bytes .../conf/__pycache__/authentication.cpython-34.pyc | Bin 616 -> 0 bytes .../conf/__pycache__/authentication.cpython-34.pyo | Bin 616 -> 0 bytes .../authentication.cpython-35.opt-1.pyc | Bin 616 -> 0 bytes .../conf/__pycache__/authentication.cpython-35.pyc | Bin 616 -> 0 bytes .../authentication.cpython-36.opt-1.pyc | Bin 580 -> 0 bytes testenv/conf/__pycache__/domains.cpython-34.pyc | Bin 624 -> 0 bytes testenv/conf/__pycache__/domains.cpython-34.pyo | Bin 624 -> 0 bytes .../conf/__pycache__/domains.cpython-35.opt-1.pyc | Bin 624 -> 0 bytes testenv/conf/__pycache__/domains.cpython-35.pyc | Bin 624 -> 0 bytes .../conf/__pycache__/domains.cpython-36.opt-1.pyc | Bin 593 -> 0 bytes .../conf/__pycache__/expect_header.cpython-34.pyc | Bin 489 -> 0 bytes .../conf/__pycache__/expect_header.cpython-34.pyo | Bin 489 -> 0 bytes .../__pycache__/expect_header.cpython-35.opt-1.pyc | Bin 492 -> 0 bytes .../conf/__pycache__/expect_header.cpython-35.pyc | Bin 492 -> 0 bytes .../__pycache__/expect_header.cpython-36.opt-1.pyc | Bin 469 -> 0 bytes .../conf/__pycache__/expected_files.cpython-34.pyc | Bin 1720 -> 0 bytes .../conf/__pycache__/expected_files.cpython-34.pyo | Bin 1720 -> 0 bytes .../expected_files.cpython-35.opt-1.pyc | Bin 1746 -> 0 bytes .../conf/__pycache__/expected_files.cpython-35.pyc | Bin 1746 -> 0 bytes .../expected_files.cpython-36.opt-1.pyc | Bin 1596 -> 0 bytes .../__pycache__/expected_ret_code.cpython-34.pyc | Bin 927 -> 0 bytes .../__pycache__/expected_ret_code.cpython-34.pyo | Bin 927 -> 0 bytes .../expected_ret_code.cpython-35.opt-1.pyc | Bin 927 -> 0 bytes .../__pycache__/expected_ret_code.cpython-35.pyc | Bin 927 -> 0 bytes .../expected_ret_code.cpython-36.opt-1.pyc | Bin 872 -> 0 bytes .../conf/__pycache__/files_crawled.cpython-34.pyc | Bin 985 -> 0 bytes .../conf/__pycache__/files_crawled.cpython-34.pyo | Bin 985 -> 0 bytes .../__pycache__/files_crawled.cpython-35.opt-1.pyc | Bin 985 -> 0 bytes .../conf/__pycache__/files_crawled.cpython-35.pyc | Bin 985 -> 0 bytes .../__pycache__/files_crawled.cpython-36.opt-1.pyc | Bin 921 -> 0 bytes .../conf/__pycache__/hook_sample.cpython-34.pyc | Bin 699 -> 0 bytes .../conf/__pycache__/hook_sample.cpython-34.pyo | Bin 699 -> 0 bytes .../__pycache__/hook_sample.cpython-35.opt-1.pyc | Bin 702 -> 0 bytes .../conf/__pycache__/hook_sample.cpython-35.pyc | Bin 702 -> 0 bytes .../__pycache__/hook_sample.cpython-36.opt-1.pyc | Bin 671 -> 0 bytes .../conf/__pycache__/local_files.cpython-34.pyc | Bin 984 -> 0 bytes .../conf/__pycache__/local_files.cpython-34.pyo | Bin 984 -> 0 bytes .../__pycache__/local_files.cpython-35.opt-1.pyc | Bin 985 -> 0 bytes .../conf/__pycache__/local_files.cpython-35.pyc | Bin 985 -> 0 bytes .../__pycache__/local_files.cpython-36.opt-1.pyc | Bin 911 -> 0 bytes .../conf/__pycache__/reject_header.cpython-34.pyc | Bin 489 -> 0 bytes .../conf/__pycache__/reject_header.cpython-34.pyo | Bin 489 -> 0 bytes .../__pycache__/reject_header.cpython-35.opt-1.pyc | Bin 492 -> 0 bytes .../conf/__pycache__/reject_header.cpython-35.pyc | Bin 492 -> 0 bytes .../__pycache__/reject_header.cpython-36.opt-1.pyc | Bin 469 -> 0 bytes testenv/conf/__pycache__/response.cpython-34.pyc | Bin 480 -> 0 bytes testenv/conf/__pycache__/response.cpython-34.pyo | Bin 480 -> 0 bytes .../conf/__pycache__/response.cpython-35.opt-1.pyc | Bin 483 -> 0 bytes testenv/conf/__pycache__/response.cpython-35.pyc | Bin 483 -> 0 bytes .../conf/__pycache__/response.cpython-36.opt-1.pyc | Bin 460 -> 0 bytes .../conf/__pycache__/rule_sample.cpython-34.pyc | Bin 502 -> 0 bytes .../conf/__pycache__/rule_sample.cpython-34.pyo | Bin 502 -> 0 bytes .../__pycache__/rule_sample.cpython-35.opt-1.pyc | Bin 505 -> 0 bytes .../conf/__pycache__/rule_sample.cpython-35.pyc | Bin 505 -> 0 bytes .../__pycache__/rule_sample.cpython-36.opt-1.pyc | Bin 482 -> 0 bytes .../conf/__pycache__/send_header.cpython-34.pyc | Bin 483 -> 0 bytes .../conf/__pycache__/send_header.cpython-34.pyo | Bin 483 -> 0 bytes .../__pycache__/send_header.cpython-35.opt-1.pyc | Bin 486 -> 0 bytes .../conf/__pycache__/send_header.cpython-35.pyc | Bin 486 -> 0 bytes .../__pycache__/send_header.cpython-36.opt-1.pyc | Bin 463 -> 0 bytes .../conf/__pycache__/server_files.cpython-34.pyc | Bin 1141 -> 0 bytes .../conf/__pycache__/server_files.cpython-34.pyo | Bin 1141 -> 0 bytes .../__pycache__/server_files.cpython-35.opt-1.pyc | Bin 1144 -> 0 bytes .../conf/__pycache__/server_files.cpython-35.pyc | Bin 1144 -> 0 bytes .../__pycache__/server_files.cpython-36.opt-1.pyc | Bin 1066 -> 0 bytes testenv/conf/__pycache__/urls.cpython-34.pyc | Bin 612 -> 0 bytes testenv/conf/__pycache__/urls.cpython-34.pyo | Bin 612 -> 0 bytes testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc | Bin 615 -> 0 bytes testenv/conf/__pycache__/urls.cpython-35.pyc | Bin 615 -> 0 bytes testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc | Bin 584 -> 0 bytes .../conf/__pycache__/wget_commands.cpython-34.pyc | Bin 673 -> 0 bytes .../conf/__pycache__/wget_commands.cpython-34.pyo | Bin 673 -> 0 bytes .../__pycache__/wget_commands.cpython-35.opt-1.pyc | Bin 676 -> 0 bytes .../conf/__pycache__/wget_commands.cpython-35.pyc | Bin 676 -> 0 bytes .../__pycache__/wget_commands.cpython-36.opt-1.pyc | Bin 642 -> 0 bytes testenv/conf/expected_files.py | 6 +- testenv/exc/__pycache__/__init__.cpython-34.pyc | Bin 124 -> 0 bytes testenv/exc/__pycache__/__init__.cpython-34.pyo | Bin 124 -> 0 bytes .../exc/__pycache__/__init__.cpython-35.opt-1.pyc | Bin 127 -> 0 bytes testenv/exc/__pycache__/__init__.cpython-35.pyc | Bin 127 -> 0 bytes .../exc/__pycache__/__init__.cpython-36.opt-1.pyc | Bin 127 -> 0 bytes .../exc/__pycache__/server_error.cpython-34.pyc | Bin 1214 -> 0 bytes .../exc/__pycache__/server_error.cpython-34.pyo | Bin 1214 -> 0 bytes .../__pycache__/server_error.cpython-35.opt-1.pyc | Bin 1217 -> 0 bytes .../exc/__pycache__/server_error.cpython-35.pyc | Bin 1217 -> 0 bytes .../__pycache__/server_error.cpython-36.opt-1.pyc | Bin 1167 -> 0 bytes testenv/exc/__pycache__/test_failed.cpython-34.pyc | Bin 507 -> 0 bytes testenv/exc/__pycache__/test_failed.cpython-34.pyo | Bin 507 -> 0 bytes .../__pycache__/test_failed.cpython-35.opt-1.pyc | Bin 510 -> 0 bytes testenv/exc/__pycache__/test_failed.cpython-35.pyc | Bin 510 -> 0 bytes .../__pycache__/test_failed.cpython-36.opt-1.pyc | Bin 491 -> 0 bytes testenv/misc/__init__.pyc | Bin 132 -> 0 bytes testenv/misc/__pycache__/__init__.cpython-34.pyc | Bin 125 -> 0 bytes testenv/misc/__pycache__/__init__.cpython-34.pyo | Bin 125 -> 0 bytes .../misc/__pycache__/__init__.cpython-35.opt-1.pyc | Bin 128 -> 0 bytes testenv/misc/__pycache__/__init__.cpython-35.pyc | Bin 128 -> 0 bytes .../misc/__pycache__/__init__.cpython-36.opt-1.pyc | Bin 128 -> 0 bytes .../__pycache__/colour_terminal.cpython-34.pyc | Bin 929 -> 0 bytes .../__pycache__/colour_terminal.cpython-34.pyo | Bin 929 -> 0 bytes .../colour_terminal.cpython-35.opt-1.pyc | Bin 924 -> 0 bytes .../__pycache__/colour_terminal.cpython-35.pyc | Bin 924 -> 0 bytes .../colour_terminal.cpython-36.opt-1.pyc | Bin 842 -> 0 bytes .../metalinkv3_xml.cpython-35.opt-1.pyc | Bin 5901 -> 0 bytes .../metalinkv3_xml.cpython-36.opt-1.pyc | Bin 5425 -> 0 bytes testenv/misc/__pycache__/wget_file.cpython-34.pyc | Bin 586 -> 0 bytes testenv/misc/__pycache__/wget_file.cpython-34.pyo | Bin 586 -> 0 bytes .../__pycache__/wget_file.cpython-35.opt-1.pyc | Bin 589 -> 0 bytes testenv/misc/__pycache__/wget_file.cpython-35.pyc | Bin 589 -> 0 bytes .../__pycache__/wget_file.cpython-36.opt-1.pyc | Bin 562 -> 0 bytes testenv/misc/colour_terminal.pyc | Bin 1101 -> 0 bytes testenv/server/__init__.pyc | Bin 134 -> 0 bytes testenv/server/__pycache__/__init__.cpython-34.pyc | Bin 127 -> 0 bytes testenv/server/__pycache__/__init__.cpython-34.pyo | Bin 127 -> 0 bytes .../__pycache__/__init__.cpython-35.opt-1.pyc | Bin 130 -> 0 bytes testenv/server/__pycache__/__init__.cpython-35.pyc | Bin 130 -> 0 bytes .../__pycache__/__init__.cpython-36.opt-1.pyc | Bin 130 -> 0 bytes testenv/server/http/__init__.pyc | Bin 139 -> 0 bytes .../http/__pycache__/__init__.cpython-34.pyc | Bin 132 -> 0 bytes .../http/__pycache__/__init__.cpython-34.pyo | Bin 132 -> 0 bytes .../http/__pycache__/__init__.cpython-35.opt-1.pyc | Bin 135 -> 0 bytes .../http/__pycache__/__init__.cpython-35.pyc | Bin 135 -> 0 bytes .../http/__pycache__/__init__.cpython-36.opt-1.pyc | Bin 135 -> 0 bytes .../http/__pycache__/http_server.cpython-34.pyc | Bin 16938 -> 0 bytes .../http/__pycache__/http_server.cpython-34.pyo | Bin 16878 -> 0 bytes .../__pycache__/http_server.cpython-35.opt-1.pyc | Bin 16816 -> 0 bytes .../http/__pycache__/http_server.cpython-35.pyc | Bin 16876 -> 0 bytes .../__pycache__/http_server.cpython-36.opt-1.pyc | Bin 15466 -> 0 bytes testenv/server/http/http_server.py | 8 + testenv/server/http/http_server.pyc | Bin 19095 -> 0 bytes testenv/test/__init__.pyc | Bin 132 -> 0 bytes testenv/test/__pycache__/__init__.cpython-34.pyc | Bin 125 -> 0 bytes testenv/test/__pycache__/__init__.cpython-34.pyo | Bin 125 -> 0 bytes .../test/__pycache__/__init__.cpython-35.opt-1.pyc | Bin 128 -> 0 bytes testenv/test/__pycache__/__init__.cpython-35.pyc | Bin 128 -> 0 bytes .../test/__pycache__/__init__.cpython-36.opt-1.pyc | Bin 128 -> 0 bytes testenv/test/__pycache__/base_test.cpython-34.pyc | Bin 8009 -> 0 bytes testenv/test/__pycache__/base_test.cpython-34.pyo | Bin 8009 -> 0 bytes .../__pycache__/base_test.cpython-35.opt-1.pyc | Bin 8141 -> 0 bytes testenv/test/__pycache__/base_test.cpython-35.pyc | Bin 8139 -> 0 bytes .../__pycache__/base_test.cpython-36.opt-1.pyc | Bin 7569 -> 0 bytes testenv/test/__pycache__/http_test.cpython-34.pyc | Bin 2077 -> 0 bytes testenv/test/__pycache__/http_test.cpython-34.pyo | Bin 2077 -> 0 bytes .../__pycache__/http_test.cpython-35.opt-1.pyc | Bin 2043 -> 0 bytes testenv/test/__pycache__/http_test.cpython-35.pyc | Bin 2043 -> 0 bytes .../__pycache__/http_test.cpython-36.opt-1.pyc | Bin 1937 -> 0 bytes testenv/test/http_test.pyc | Bin 2256 -> 0 bytes tests/Makefile.am | 4 +- tests/Makefile.in | 98 +- tests/Test-https-badcerts.px | 2 +- tests/Test-https-clientcert.px | 2 +- tests/Test-https-crl.px | 2 +- tests/Test-https-pfs.px | 2 +- tests/Test-https-selfsigned.px | 2 +- tests/Test-https-tlsv1.px | 2 +- tests/Test-https-tlsv1x.px | 2 +- tests/Test-https-weboftrust.px | 5 +- tests/certs/interca.conf | 2 +- tests/certs/rootca.conf | 2 +- util/Makefile.am | 4 +- util/Makefile.in | 98 +- util/rmold.pl | 4 +- 932 files changed, 35082 insertions(+), 41088 deletions(-) delete mode 100755 build-aux/ar-lib delete mode 100644 build-aux/ltmain.sh delete mode 100644 build-aux/snippet/_Noreturn.h delete mode 100644 build-aux/snippet/arg-nonnull.h delete mode 100644 build-aux/snippet/c++defs.h delete mode 100644 build-aux/snippet/unused-parameter.h delete mode 100644 build-aux/snippet/warn-on-use.h create mode 100644 lib/_Noreturn.h create mode 100644 lib/arg-nonnull.h create mode 100644 lib/c++defs.h create mode 100644 lib/filename.h create mode 100644 lib/getopt-cdefs.in.h create mode 100644 lib/getopt-core.h create mode 100644 lib/getopt-ext.h create mode 100644 lib/getopt-pfx-core.h create mode 100644 lib/getopt-pfx-ext.h create mode 100644 lib/localtime-buffer.c create mode 100644 lib/localtime-buffer.h create mode 100644 lib/malloca.c create mode 100644 lib/malloca.h create mode 100644 lib/malloca.valgrind create mode 100644 lib/stat-w32.c create mode 100644 lib/stat-w32.h delete mode 100644 lib/unicase/special-casing.h create mode 100644 lib/unicase/special-casing.in.h create mode 100644 lib/unused-parameter.h create mode 100644 lib/utime.c create mode 100644 lib/utime.in.h create mode 100644 lib/warn-on-use.h create mode 100644 m4/host-cpu-c-abi.m4 create mode 100644 m4/localtime-buffer.m4 create mode 100644 m4/malloca.m4 create mode 100644 m4/open-cloexec.m4 delete mode 100644 m4/utimbuf.m4 create mode 100644 m4/utime.m4 create mode 100644 m4/utime_h.m4 create mode 100755 testenv/Test-416.py delete mode 100644 testenv/conf/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/authentication.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/authentication.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/authentication.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/domains.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/domains.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/domains.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expect_header.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/expect_header.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expect_header.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expected_files.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/expected_files.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expected_files.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/files_crawled.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/files_crawled.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/files_crawled.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/hook_sample.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/hook_sample.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/hook_sample.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/local_files.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/local_files.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/local_files.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/reject_header.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/reject_header.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/reject_header.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/response.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/response.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/response.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/response.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/response.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/rule_sample.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/rule_sample.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/rule_sample.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/send_header.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/send_header.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/send_header.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/server_files.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/server_files.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/server_files.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/urls.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/urls.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/urls.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/wget_commands.cpython-34.pyc delete mode 100644 testenv/conf/__pycache__/wget_commands.cpython-34.pyo delete mode 100644 testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc delete mode 100644 testenv/conf/__pycache__/wget_commands.cpython-35.pyc delete mode 100644 testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/exc/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/server_error.cpython-34.pyc delete mode 100644 testenv/exc/__pycache__/server_error.cpython-34.pyo delete mode 100644 testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/server_error.cpython-35.pyc delete mode 100644 testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/test_failed.cpython-34.pyc delete mode 100644 testenv/exc/__pycache__/test_failed.cpython-34.pyo delete mode 100644 testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc delete mode 100644 testenv/exc/__pycache__/test_failed.cpython-35.pyc delete mode 100644 testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc delete mode 100644 testenv/misc/__init__.pyc delete mode 100644 testenv/misc/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/misc/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/colour_terminal.cpython-34.pyc delete mode 100644 testenv/misc/__pycache__/colour_terminal.cpython-34.pyo delete mode 100644 testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/colour_terminal.cpython-35.pyc delete mode 100644 testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/wget_file.cpython-34.pyc delete mode 100644 testenv/misc/__pycache__/wget_file.cpython-34.pyo delete mode 100644 testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc delete mode 100644 testenv/misc/__pycache__/wget_file.cpython-35.pyc delete mode 100644 testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc delete mode 100644 testenv/misc/colour_terminal.pyc delete mode 100644 testenv/server/__init__.pyc delete mode 100644 testenv/server/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/server/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/server/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/server/http/__init__.pyc delete mode 100644 testenv/server/http/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/server/http/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/server/http/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/server/http/__pycache__/http_server.cpython-34.pyc delete mode 100644 testenv/server/http/__pycache__/http_server.cpython-34.pyo delete mode 100644 testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc delete mode 100644 testenv/server/http/__pycache__/http_server.cpython-35.pyc delete mode 100644 testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc delete mode 100644 testenv/server/http/http_server.pyc delete mode 100644 testenv/test/__init__.pyc delete mode 100644 testenv/test/__pycache__/__init__.cpython-34.pyc delete mode 100644 testenv/test/__pycache__/__init__.cpython-34.pyo delete mode 100644 testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc delete mode 100644 testenv/test/__pycache__/__init__.cpython-35.pyc delete mode 100644 testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc delete mode 100644 testenv/test/__pycache__/base_test.cpython-34.pyc delete mode 100644 testenv/test/__pycache__/base_test.cpython-34.pyo delete mode 100644 testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc delete mode 100644 testenv/test/__pycache__/base_test.cpython-35.pyc delete mode 100644 testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc delete mode 100644 testenv/test/__pycache__/http_test.cpython-34.pyc delete mode 100644 testenv/test/__pycache__/http_test.cpython-34.pyo delete mode 100644 testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc delete mode 100644 testenv/test/__pycache__/http_test.cpython-35.pyc delete mode 100644 testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc delete mode 100644 testenv/test/http_test.pyc diff --git a/.tarball-version b/.tarball-version index 836ae4e..1b92e58 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -1.19.2 +1.19.3 diff --git a/.version b/.version index 836ae4e..1b92e58 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.19.2 +1.19.3 diff --git a/COPYING b/COPYING index 94a9ed0..e600086 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/ChangeLog b/ChangeLog index 0bac795..7178ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,134 @@ +2018-01-19 Tim Rühsen + + * src/host.c (sufmatch): Fix to domain matching + +2018-01-17 Gisle Vanem + + * src/netrc.c: Fix Standalone compilation of netrc file + +2018-01-14 Darshit Shah + + * NEWS: Update NEWS file for new release + + * bootstrap: Use the faster gnulib-tool.py script if possible + + Sync the bootstrap script from gnulib + + Update Copyright years + + Replace HTTP urls with HTTPS where valid + + Update gnulib + + * src/netrc.c: Search for the correct netrc file on Windows + +2018-01-10 Tim Rühsen + + * src/http.c: Exclude *.gz and *.tgz from decompression + +2017-12-31 Tim Rühsen + + * src/utils.c (wg_pin_peer_pubkey): Fix format warning + +2017-12-31 Peter Wu + + Avoid redirecting output to file when tcgetpgrp fails + * src/log.c (check_redirect_output): tcgetpgrp can return -1 (ENOTTY), + be sure to check whether a valid controlling terminal exists before + redirecting. + + Fixes: #51181 + +2017-12-11 Darshit Shah + + Add new test for 416 responses + * testenv/server/http/http_server.py: If there are multiple requests in + which the requested range is unsatisfiable, then send a body in the in + the 2nd response onwards + * testenv/Test-416.py: New test to check how Wget handles 416 responses + +2017-12-08 Darshit Shah + + Don't assume a 416 response has no body + * http.c(gethttp): In case of a 416 response, try to drain the socket of + any bytes before reusing the connection + + Reported-By: Iru Cai + +2017-11-26 Tim Rühsen + + Support building with OpenSSL 1.1 w/o deprecated features + * src/openssl.c (ssl_init): Fix code for the subject's issue + + Reported-by: Matthew Thode + +2017-11-25 Tim Rühsen + + Avoid link conversion after 304 Not Modified + * src/http.c (gethttp): Handle 304 before setting document content type + + Fixes: #52404 + Reported-by: Ben Fuchs + +2017-11-16 YX Hao + + Fix printing mutibyte chars as unprintable chars on Windows + * src/log.c (get_warc_log_fp): Fix return value to stderr + * src/main.c (main): Init logging as soon as possible, + fix locale/charset on Windows + +2017-11-16 Tim Rühsen + + * tests/Test-https-weboftrust.px: Fix/add sslport + +2017-11-15 YX Hao + + Convert remote path to local encoding + * src/url.c (url_file_name): Convert remote path to local encoding + +2017-11-10 Tim Rühsen + + Do not use must-revalidate in Cache-Control header + As the bug report states, 'must-revalidate' is a request directive. + + Fixes #52379 + +2017-11-06 Darshit Shah + + Fix Segfault due to derefencing null ptr + * src/http.c(gethttp): When Encoding is gzip, ensure that the + Content-Type Header was actually seen. Without this, the "type" variable + is null causing a Segfault. + + Reported-By: Noël Köthe + +2017-11-03 Tim Rühsen + + * src/http.c: Fix H_REDIRECTED + + * src/http.c: Add support for HTTP status code 308 + +2017-10-30 Tim Rühsen + + Fix uninitialized value messages in tests + * tests/Test-https-*.px: Use correct variable in error message + + Reported-by: Jeffrey Walton + +2017-10-30 Tim Rühsen + + Ignore dirmngr.conf, gpg.conf in test directories + * testenv/conf/expected_files.py: Ignore dirmngr.conf, gpg.conf + + Libgpgme creates certain files if $HOME doesn't contain the .gnupg directory. + These files disturb some metalink tests if we don't ignore them. + + Reported-by: Arkadiusz MiÅ›kiewicz + +2017-10-27 Tim Rühsen + + * contrib/release: Cleanup, use lzip instead of xz + 2017-10-26 Tim Rühsen Fix heap overflow in HTTP protocol handling (CVE-2017-13090) diff --git a/GNUmakefile b/GNUmakefile index a2f8111..7ee0965 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2018 Free Software Foundation, Inc. # This 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 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # If the user runs GNU make but has not yet run ./configure, # give them a diagnostic. diff --git a/MAILING-LIST b/MAILING-LIST index 65ca8e6..d8ce69c 100644 --- a/MAILING-LIST +++ b/MAILING-LIST @@ -7,21 +7,14 @@ Primary List The primary mailinglist for discussion, bug-reports, or questions about GNU Wget is at . To subscribe, send an email to , or visit -`http://lists.gnu.org/mailman/listinfo/bug-wget'. +`https://lists.gnu.org/mailman/listinfo/bug-wget'. You do not need to subscribe to send a message to the list; however, please note that unsubscribed messages are moderated, and may take a while before they hit the list--*usually around a day*. If you want your message to show up immediately, please subscribe to the list before posting. Archives for the list may be found at -`http://lists.gnu.org/pipermail/bug-wget/'. - - An NNTP/Usenettish gateway is also available via Gmane -(http://gmane.org/about.php). You can see the Gmane archives at -`http://news.gmane.org/gmane.comp.web.wget.general'. Note that the -Gmane archives conveniently include messages from both the current -list, and the previous one. Messages also show up in the Gmane archives -sooner than they do at `lists.gnu.org'. +`https://lists.gnu.org/pipermail/bug-wget/'. Obsolete Lists -------------- @@ -31,10 +24,7 @@ discussion list, and another list, was used for submitting and discussing patches to GNU Wget. Messages from are archived at - `http://www.mail-archive.com/wget%40sunsite.dk/' and at - - `http://news.gmane.org/gmane.comp.web.wget.general' (which also - continues to archive the current list, ). + `https://www.mail-archive.com/wget%40sunsite.dk/' and at Messages from are archived at - `http://news.gmane.org/gmane.comp.web.wget.patches'. + `https://news.gmane.org/gmane.comp.web.wget.patches'. diff --git a/Makefile.am b/Makefile.am index 66112fa..f520a2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Makefile for `Wget' utility -# Copyright (C) 1995, 1996, 1997, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2006-2018 Free Software Foundation, +# Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Additional permission under GNU GPL version 3 section 7 diff --git a/Makefile.in b/Makefile.in index 0dc4d42..3d40b2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,8 +15,8 @@ @SET_MAKE@ # Makefile for `Wget' utility -# Copyright (C) 1995, 1996, 1997, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2006-2018 Free Software Foundation, +# Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Additional permission under GNU GPL version 3 section 7 @@ -150,7 +150,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -166,28 +167,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -225,17 +227,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -302,7 +305,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/build-aux/ar-lib \ +am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.rpath \ @@ -311,11 +314,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/build-aux/ar-lib \ $(top_srcdir)/build-aux/missing \ $(top_srcdir)/tests/certs/interca.conf.in \ $(top_srcdir)/tests/certs/rootca.conf.in ABOUT-NLS AUTHORS \ - COPYING ChangeLog INSTALL NEWS README build-aux/ar-lib \ - build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \ - build-aux/missing build-aux/texinfo.tex + COPYING ChangeLog INSTALL NEWS README build-aux/compile \ + build-aux/config.guess build-aux/config.rpath \ + build-aux/config.sub build-aux/install-sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -403,6 +404,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -419,6 +421,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -426,6 +429,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -498,6 +502,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -543,6 +548,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -591,6 +597,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -627,6 +634,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -650,7 +658,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -658,6 +668,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -681,6 +692,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -721,6 +733,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -743,12 +756,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -769,6 +784,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -862,6 +878,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -916,13 +933,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -939,6 +960,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -969,6 +991,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1003,6 +1027,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1074,6 +1099,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1107,6 +1133,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1145,10 +1172,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1257,6 +1286,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1273,11 +1303,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1286,6 +1319,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1316,6 +1350,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1323,6 +1358,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1333,7 +1370,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/NEWS b/NEWS index 5e01a3c..1feea2c 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,25 @@ GNU Wget NEWS -- history of user-visible changes. -Copyright (C) 1997-2017 Free Software Foundation, Inc. +Copyright (C) 1997-2018 Free Software Foundation, Inc. See the end for copying conditions. Please send GNU Wget bug reports to . +* Changes in Wget 1.19.3 + +* Prevent erroneous decompression of .gz and .tgz files with broken servers + +* Added support for HTTP 308 Permanent Redirect response + +* Fix a segfault in some cases where the Content-Type header is not sent + +* Support OpenSSL 1.1 builds without using deprecated features + +* Fix netrc file detection on Windows + +* Several minor bug fixes + + * Changes in Wget 1.19.2 * Fix CVE-2017-13089 (Stack overflow in HTTP protocol handling) diff --git a/README b/README index 61cb2aa..692e1c6 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -*- text -*- GNU Wget ======== - Current Web home: http://www.gnu.org/software/wget/ + Current Web home: https://www.gnu.org/software/wget/ GNU Wget is a free utility for non-interactive download of files from the Web. It supports HTTP, HTTPS, and FTP protocols, as well as @@ -50,10 +50,10 @@ resides at . Please report bugs in Wget to . See the file `MAILING-LIST' for information about Wget mailing lists. -Wget's home page is at . +Wget's home page is at . If you would like to contribute code for Wget, please read -http://wget.addictivecode.org/PatchGuidelines. +https://wget.addictivecode.org/PatchGuidelines. Wget was originally written and mainained by Hrvoje Niksic. Please see the file AUTHORS for a list of major contributors, and the ChangeLogs diff --git a/aclocal.m4 b/aclocal.m4 index ae13d68..7a8b288 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -304,9 +304,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], AC_SUBST(GPGME_GLIB_LIBS) ]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -347,7 +347,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -448,7 +448,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -458,11 +458,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -479,7 +479,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -616,66 +616,6 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2017 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_AR([ACT-IF-FAIL]) -# ------------------------- -# Try to determine the archiver interface, and trigger the ar-lib wrapper -# if it is needed. If the detection of archiver interface fails, run -# ACT-IF-FAIL (default is to abort configure with a proper error message). -AC_DEFUN([AM_PROG_AR], -[AC_BEFORE([$0], [LT_INIT])dnl -AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([ar-lib])dnl -AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) -: ${AR=ar} - -AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [AC_LANG_PUSH([C]) - am_cv_ar_interface=ar - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], - [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([am_ar_try]) - if test "$ac_status" -eq 0; then - am_cv_ar_interface=ar - else - am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([am_ar_try]) - if test "$ac_status" -eq 0; then - am_cv_ar_interface=lib - else - am_cv_ar_interface=unknown - fi - fi - rm -f conftest.lib libconftest.a - ]) - AC_LANG_POP([C])]) - -case $am_cv_ar_interface in -ar) - ;; -lib) - # Microsoft lib, so override with the ar-lib wrapper script. - # FIXME: It is wrong to rewrite AR. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__AR in this case, - # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something - # similar. - AR="$am_aux_dir/ar-lib $AR" - ;; -unknown) - m4_default([$1], - [AC_MSG_ERROR([could not determine $AR interface])]) - ;; -esac -AC_SUBST([AR])dnl -]) - # AM_AUX_DIR_EXPAND -*- Autoconf -*- # Copyright (C) 2001-2017 Free Software Foundation, Inc. @@ -1467,7 +1407,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl supported. (2.0 was released on October 16, 2000). dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -2060,6 +2000,7 @@ m4_include([m4/gnulib-common.m4]) m4_include([m4/gnulib-comp.m4]) m4_include([m4/group-member.m4]) m4_include([m4/hard-locale.m4]) +m4_include([m4/host-cpu-c-abi.m4]) m4_include([m4/hostent.m4]) m4_include([m4/iconv.m4]) m4_include([m4/iconv_h.m4]) @@ -2089,11 +2030,13 @@ m4_include([m4/locale-ja.m4]) m4_include([m4/locale-zh.m4]) m4_include([m4/locale_h.m4]) m4_include([m4/localeconv.m4]) +m4_include([m4/localtime-buffer.m4]) m4_include([m4/lock.m4]) m4_include([m4/longlong.m4]) m4_include([m4/lseek.m4]) m4_include([m4/lstat.m4]) m4_include([m4/malloc.m4]) +m4_include([m4/malloca.m4]) m4_include([m4/mbchar.m4]) m4_include([m4/mbiter.m4]) m4_include([m4/mbrtowc.m4]) @@ -2122,6 +2065,7 @@ m4_include([m4/nl_langinfo.m4]) m4_include([m4/nls.m4]) m4_include([m4/nocrash.m4]) m4_include([m4/off_t.m4]) +m4_include([m4/open-cloexec.m4]) m4_include([m4/open.m4]) m4_include([m4/pathmax.m4]) m4_include([m4/pipe.m4]) @@ -2200,7 +2144,8 @@ m4_include([m4/unistd-safer.m4]) m4_include([m4/unistd_h.m4]) m4_include([m4/unlink.m4]) m4_include([m4/unlocked-io.m4]) -m4_include([m4/utimbuf.m4]) +m4_include([m4/utime.m4]) +m4_include([m4/utime_h.m4]) m4_include([m4/utimens.m4]) m4_include([m4/utimes.m4]) m4_include([m4/vasnprintf.m4]) diff --git a/build-aux/announce-gen b/build-aux/announce-gen index e789b13..e566490 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' if 0; # Generate a release announcement message. -my $VERSION = '2016-01-12 23:09'; # UTC +my $VERSION = '2017-09-13 06:45'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ my $VERSION = '2016-01-12 23:09'; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Written by Jim Meyering @@ -492,17 +492,17 @@ EOF if ($url_dir_list[0] =~ "gnu\.org") { print "Use a mirror for higher download bandwidth:\n"; - if (@tarballs == 1 && $url_dir_list[0] =~ m!http://ftp\.gnu\.org/gnu/!) + if (@tarballs == 1 && $url_dir_list[0] =~ m!https://ftp\.gnu\.org/gnu/!) { (my $m = "$url_dir_list[0]/$tarballs[0]") - =~ s!http://ftp\.gnu\.org/gnu/!http://ftpmirror\.gnu\.org/!; + =~ s!https://ftp\.gnu\.org/gnu/!https://ftpmirror\.gnu\.org/!; print " $m\n" . " $m.sig\n\n"; } else { - print " http://www.gnu.org/order/ftp.html\n\n"; + print " https://www.gnu.org/order/ftp.html\n\n"; } } diff --git a/build-aux/ar-lib b/build-aux/ar-lib deleted file mode 100755 index 05094d3..0000000 --- a/build-aux/ar-lib +++ /dev/null @@ -1,270 +0,0 @@ -#! /bin/sh -# Wrapper for Microsoft lib.exe - -me=ar-lib -scriptversion=2012-03-01.08; # UTC - -# Copyright (C) 2010-2017 Free Software Foundation, Inc. -# Written by Peter Rosin . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - - -# func_error message -func_error () -{ - echo "$me: $1" 1>&2 - exit 1 -} - -file_conv= - -# func_file_conv build_file -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv in - mingw) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_at_file at_file operation archive -# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE -# for each of them. -# When interpreting the content of the @FILE, do NOT use func_file_conv, -# since the user would need to supply preconverted file names to -# binutils ar, at least for MinGW. -func_at_file () -{ - operation=$2 - archive=$3 - at_file_contents=`cat "$1"` - eval set x "$at_file_contents" - shift - - for member - do - $AR -NOLOGO $operation:"$member" "$archive" || exit $? - done -} - -case $1 in - '') - func_error "no command. Try '$0 --help' for more information." - ;; - -h | --h*) - cat <. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/config.guess b/build-aux/config.guess index 1000e2b..a710e2f 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-02-07' +timestamp='2018-01-11' # 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 @@ -15,7 +15,7 @@ timestamp='2017-02-07' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2017-02-07' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -244,6 +244,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} exit ;; + *:MidnightBSD:*:*) + echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -259,6 +262,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:Sortix:*:*) echo ${UNAME_MACHINE}-unknown-sortix exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -315,15 +324,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -485,13 +485,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); @@ -614,7 +614,7 @@ EOF *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and @@ -635,8 +635,8 @@ EOF 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` @@ -749,7 +749,7 @@ EOF { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -758,7 +758,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -837,10 +837,11 @@ EOF UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -854,10 +855,6 @@ EOF *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; @@ -873,27 +870,12 @@ EOF echo ia64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -1096,7 +1078,7 @@ EOF i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + i*86:*:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} @@ -1303,14 +1285,21 @@ EOF if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1334,16 +1323,19 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; - NSX-?:NONSTOP_KERNEL:*:*) + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk${UNAME_RELEASE} + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) echo nsx-tandem-nsk${UNAME_RELEASE} exit ;; *:NonStop-UX:*:*) @@ -1417,16 +1409,28 @@ EOF exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 <, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index 87abeab..5ff9a77 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2017-02-07' +timestamp='2018-01-13' # 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 @@ -15,7 +15,7 @@ timestamp='2017-02-07' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ timestamp='2017-02-07' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -229,9 +229,6 @@ case $os in -ptx*) basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; -psos*) os=-psos ;; @@ -263,7 +260,7 @@ case $basic_machine in | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -315,7 +312,7 @@ case $basic_machine in | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ - | we32k \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -388,7 +385,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -446,6 +443,7 @@ case $basic_machine in | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -641,7 +639,7 @@ case $basic_machine in basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -903,7 +901,7 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -948,6 +946,9 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -1246,6 +1247,9 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1254,6 +1258,9 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1361,8 +1368,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1382,9 +1389,9 @@ case $os in -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1412,7 +1419,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1487,7 +1494,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1542,6 +1549,19 @@ case $os in -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) @@ -1689,7 +1709,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1704,9 +1724,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1824,7 +1841,7 @@ echo $basic_machine$os exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/depcomp b/build-aux/depcomp index b687232..49eb4bf 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-16.17; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -251,6 +251,41 @@ hp) exit 1 ;; +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" + # The second pass generates a dummy entry for each header file. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + xlc) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 079849d..8647b9e 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,8 +1,8 @@ #!/bin/sh # Print a version string. -scriptversion=2017-01-09.19; # UTC +scriptversion=2017-09-13.06; # UTC -# Copyright (C) 2007-2017 Free Software Foundation, Inc. +# Copyright (C) 2007-2018 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ scriptversion=2017-01-09.19; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . -# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# This script is derived from GIT-VERSION-GEN from GIT: https://git-scm.com/. # It may be run two ways: # - from a git repository in which the "git describe" command below # produces useful output (thus requiring at least one signed tag) @@ -167,9 +167,10 @@ then # tag or the previous older version that did not? # Newer: v6.10-77-g0f8faeb # Older: v6.10-g0f8faeb - case $v in - *-*-*) : git describe is okay three part flavor ;; - *-*) + vprefix=`expr "X$v" : 'X\(.*\)-g[^-]*$'` || vprefix=$v + case $vprefix in + *-*) : git describe is probably okay three part flavor ;; + *) : git describe is older two part flavor # Recreate the number of commits and rewrite such that the # result is the same as if we were using the newer version @@ -184,9 +185,9 @@ then ;; esac - # Change the first '-' to a '.', so version-comparing tools work properly. - # Remove the "g" in git describe's output string, to save a byte. - v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; + # Change the penultimate "-" to ".", for version-comparing tools. + # Remove the "g" to save a byte. + v=`echo "$v" | sed 's/-\([^-]*\)-g\([^-]*\)$/.\1-\2/'`; v_from_git=1 elif test "x$fallback" = x || git --version >/dev/null 2>&1; then v=UNKNOWN diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index cf16425..d8074aa 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2016-03-22 21:49'; # UTC +my $VERSION = '2017-09-13 06:45'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ my $VERSION = '2016-03-22 21:49'; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Written by Jim Meyering @@ -33,7 +33,7 @@ use POSIX qw(strftime); (my $ME = $0) =~ s|.*/||; -# use File::Coda; # http://meyering.net/code/Coda/ +# use File::Coda; # https://meyering.net/code/Coda/ END { defined fileno STDOUT or return; close STDOUT and return; diff --git a/build-aux/gnupload b/build-aux/gnupload index d4d95ee..90b8c4e 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,9 +1,9 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-13.06; # UTC -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Originally written by Alexandre Duret-Lutz . # The master copy of this file is maintained in the gnulib Git repository. @@ -78,7 +78,7 @@ in the current working directory, its contents are prepended to the actual command line options. Use this to keep your defaults. Comments (#) and empty lines in $conffile are allowed. - + gives some further background. Examples: @@ -108,7 +108,7 @@ Examples: gnupload executes a program ncftpput to do the transfers; if you don't happen to have an ncftp package installed, the ncftpput-ftp script in the build-aux/ directory of the gnulib package -(http://savannah.gnu.org/projects/gnulib) may serve as a replacement. +(https://savannah.gnu.org/projects/gnulib) may serve as a replacement. Send patches and bug reports to ." diff --git a/build-aux/install-sh b/build-aux/install-sh index 0360b79..ac159ce 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-23.17; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -427,8 +435,8 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh deleted file mode 100644 index bffda54..0000000 --- a/build-aux/ltmain.sh +++ /dev/null @@ -1,9661 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index f80075c..21247c5 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -1,9 +1,9 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-22.02; # UTC -# Copyright (C) 1995-2017 Free Software Foundation, Inc. +# Copyright (C) 1995-2018 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -74,6 +74,10 @@ export LC_ALL LC_TIME=C export LC_TIME +# Use UTC to get reproducible result. +TZ=UTC0 +export TZ + # GNU ls changes its time format in response to the TIME_STYLE # variable. Since we cannot assume 'unset' works, revert this # variable to its documented default. diff --git a/build-aux/missing b/build-aux/missing index f62bbae..c6e3795 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ exit $st # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/snippet/_Noreturn.h b/build-aux/snippet/_Noreturn.h deleted file mode 100644 index c44ad89..0000000 --- a/build-aux/snippet/_Noreturn.h +++ /dev/null @@ -1,10 +0,0 @@ -#if !defined _Noreturn && __STDC_VERSION__ < 201112 -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif -#endif diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h deleted file mode 100644 index 1e62cc8..0000000 --- a/build-aux/snippet/arg-nonnull.h +++ /dev/null @@ -1,26 +0,0 @@ -/* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools - that the values passed as arguments n, ..., m must be non-NULL pointers. - n = 1 stands for the first argument, n = 2 for the second argument etc. */ -#ifndef _GL_ARG_NONNULL -# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 -# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -# else -# define _GL_ARG_NONNULL(params) -# endif -#endif diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h deleted file mode 100644 index f03f359..0000000 --- a/build-aux/snippet/c++defs.h +++ /dev/null @@ -1,316 +0,0 @@ -/* C++ compatible function declaration macros. - Copyright (C) 2010-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifndef _GL_CXXDEFS_H -#define _GL_CXXDEFS_H - -/* Begin/end the GNULIB_NAMESPACE namespace. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { -# define _GL_END_NAMESPACE } -#else -# define _GL_BEGIN_NAMESPACE -# define _GL_END_NAMESPACE -#endif - -/* The three most frequent use cases of these macros are: - - * For providing a substitute for a function that is missing on some - platforms, but is declared and works fine on the platforms on which - it exists: - - #if @GNULIB_FOO@ - # if !@HAVE_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on all platforms, - but is broken/insufficient and needs to be replaced on some platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif - - * For providing a replacement for a function that exists on some platforms - but is broken/insufficient and needs to be replaced on some of them and - is additionally either missing or undeclared on some other platforms: - - #if @GNULIB_FOO@ - # if @REPLACE_FOO@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef foo - # define foo rpl_foo - # endif - _GL_FUNCDECL_RPL (foo, ...); - _GL_CXXALIAS_RPL (foo, ...); - # else - # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ - _GL_FUNCDECL_SYS (foo, ...); - # endif - _GL_CXXALIAS_SYS (foo, ...); - # endif - _GL_CXXALIASWARN (foo); - #elif defined GNULIB_POSIXCHECK - ... - #endif -*/ - -/* _GL_EXTERN_C declaration; - performs the declaration with C linkage. */ -#if defined __cplusplus -# define _GL_EXTERN_C extern "C" -#else -# define _GL_EXTERN_C extern -#endif - -/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); - declares a replacement function, named rpl_func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - */ -#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ - _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype rpl_func parameters_and_attributes - -/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); - declares the system function, named func, with the given prototype, - consisting of return type, parameters, and attributes. - Example: - _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) - _GL_ARG_NONNULL ((1))); - */ -#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C rettype func parameters_and_attributes - -/* _GL_CXXALIAS_RPL (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to rpl_func, if GNULIB_NAMESPACE is defined. - Example: - _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); - - Wrapping rpl_func in an object with an inline conversion operator - avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ - _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::rpl_func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); - is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); - except that the C function rpl_func may have a slightly different - declaration. A cast is used to silence the "invalid conversion" error - that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::rpl_func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS (func, rettype, parameters); - declares a C++ alias called GNULIB_NAMESPACE::func - that redirects to the system provided function func, if GNULIB_NAMESPACE - is defined. - Example: - _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); - - Wrapping func in an object with an inline conversion operator - avoids a reference to func unless GNULIB_NAMESPACE::func is - actually used in the program. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return ::func; \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function func may have a slightly different declaration. - A cast is used to silence the "invalid conversion" error that would - otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast(::func); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); - is like _GL_CXXALIAS_SYS (func, rettype, parameters); - except that the C function is picked among a set of overloaded functions, - namely the one with rettype2 and parameters2. Two consecutive casts - are used to silence the "cannot find a match" and "invalid conversion" - errors that would otherwise occur. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE - /* The outer cast must be a reinterpret_cast. - The inner cast: When the function is defined as a set of overloaded - functions, it works as a static_cast<>, choosing the designated variant. - When the function is defined as a single variant, it works as a - reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - namespace GNULIB_NAMESPACE \ - { \ - static const struct _gl_ ## func ## _wrapper \ - { \ - typedef rettype (*type) parameters; \ - \ - inline operator type () const \ - { \ - return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ - } \ - } func = {}; \ - } \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#else -# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN (func); - causes a warning to be emitted when ::func is used but not when - GNULIB_NAMESPACE::func is used. func must be defined without overloaded - variants. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN(func) \ - _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN_1(func,namespace) \ - _GL_CXXALIASWARN_2 (func, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !__OPTIMIZE__ -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_WARN_ON_USE (func, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -# define _GL_CXXALIASWARN_2(func,namespace) \ - extern __typeof__ (func) func -# else -# define _GL_CXXALIASWARN_2(func,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN(func) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); - causes a warning to be emitted when the given overloaded variant of ::func - is used but not when GNULIB_NAMESPACE::func is used. */ -#if defined __cplusplus && defined GNULIB_NAMESPACE -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ - GNULIB_NAMESPACE) -# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ - _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -/* To work around GCC bug , - we enable the warning only when not optimizing. */ -# if !__OPTIMIZE__ -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ - "The symbol ::" #func " refers to the system function. " \ - "Use " #namespace "::" #func " instead.") -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - extern __typeof__ (func) func -# else -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -# endif -#else -# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ - _GL_EXTERN_C int _gl_cxxalias_dummy -#endif - -#endif /* _GL_CXXDEFS_H */ diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h deleted file mode 100644 index b300055..0000000 --- a/build-aux/snippet/unused-parameter.h +++ /dev/null @@ -1,36 +0,0 @@ -/* A C macro for declaring that specific function parameters are not used. - Copyright (C) 2008-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter - declarations for parameters that are not used. This helps to reduce - warnings, such as from GCC -Wunused-parameter. The syntax is as follows: - type param _GL_UNUSED_PARAMETER - or more generally - param_decl _GL_UNUSED_PARAMETER - For example: - int param _GL_UNUSED_PARAMETER - int *(*param)(void) _GL_UNUSED_PARAMETER - Other possible, but obscure and discouraged syntaxes: - int _GL_UNUSED_PARAMETER *(*param)(void) - _GL_UNUSED_PARAMETER int *(*param)(void) - */ -#ifndef _GL_UNUSED_PARAMETER -# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED_PARAMETER __attribute__ ((__unused__)) -# else -# define _GL_UNUSED_PARAMETER -# endif -#endif diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h deleted file mode 100644 index 3c0eb57..0000000 --- a/build-aux/snippet/warn-on-use.h +++ /dev/null @@ -1,109 +0,0 @@ -/* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2017 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* _GL_WARN_ON_USE (function, "literal string") issues a declaration - for FUNCTION which will then trigger a compiler warning containing - the text of "literal string" anywhere that function is called, if - supported by the compiler. If the compiler does not support this - feature, the macro expands to an unused extern declaration. - - This macro is useful for marking a function as a potential - portability trap, with the intent that "literal string" include - instructions on the replacement function that should be used - instead. However, one of the reasons that a function is a - portability trap is if it has the wrong signature. Declaring - FUNCTION with a different signature in C is a compilation error, so - this macro must use the same type as any existing declaration so - that programs that avoid the problematic FUNCTION do not fail to - compile merely because they included a header that poisoned the - function. But this implies that _GL_WARN_ON_USE is only safe to - use if FUNCTION is known to already have a declaration. Use of - this macro implies that there must not be any other macro hiding - the declaration of FUNCTION; but undefining FUNCTION first is part - of the poisoning process anyway (although for symbols that are - provided only via a macro, the result is a compilation error rather - than a warning containing "literal string"). Also note that in - C++, it is only safe to use if FUNCTION has no overloads. - - For an example, it is possible to poison 'getline' by: - - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], - [getline]) in configure.ac, which potentially defines - HAVE_RAW_DECL_GETLINE - - adding this code to a header that wraps the system : - #undef getline - #if HAVE_RAW_DECL_GETLINE - _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" - "not universally present; use the gnulib module getline"); - #endif - - It is not possible to directly poison global variables. But it is - possible to write a wrapper accessor function, and poison that - (less common usage, like &environ, will cause a compilation error - rather than issue the nice warning, but the end result of informing - the developer about their portability problem is still achieved): - #if HAVE_RAW_DECL_ENVIRON - static char ***rpl_environ (void) { return &environ; } - _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); - # undef environ - # define environ (*rpl_environ ()) - #endif - */ -#ifndef _GL_WARN_ON_USE - -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -# define _GL_WARN_ON_USE(function, message) \ -extern __typeof__ (function) function __attribute__ ((__warning__ (message))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE(function, message) \ -extern __typeof__ (function) function -# else /* Unsupported. */ -# define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# endif -#endif - -/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") - is like _GL_WARN_ON_USE (function, "string"), except that the function is - declared with the given prototype, consisting of return type, parameters, - and attributes. - This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does - not work in this case. */ -#ifndef _GL_WARN_ON_USE_CXX -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -extern rettype function parameters_and_attributes \ - __attribute__ ((__warning__ (msg))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -/* Verify the existence of the function. */ -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -extern rettype function parameters_and_attributes -# else /* Unsupported. */ -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -_GL_WARN_EXTERN_C int _gl_warn_on_use -# endif -#endif - -/* _GL_WARN_EXTERN_C declaration; - performs the declaration with C linkage. */ -#ifndef _GL_WARN_EXTERN_C -# if defined __cplusplus -# define _GL_WARN_EXTERN_C extern "C" -# else -# define _GL_WARN_EXTERN_C extern -# endif -#endif diff --git a/build-aux/test-driver b/build-aux/test-driver index 8e575b0..0218a01 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -143,6 +143,6 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 338bcf6..c614e02 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{2017-01-14.15} +\def\texinfoversion{2018-01-09.11} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 % Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or @@ -21,7 +21,7 @@ % General Public License for more details. % % You should have received a copy of the GNU General Public License -% along with this program. If not, see . +% along with this program. If not, see . % % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without @@ -30,9 +30,9 @@ % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or -% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or -% http://www.gnu.org/software/texinfo/ (the Texinfo home page) +% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +% https://www.gnu.org/software/texinfo/ (the Texinfo home page) % The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % @@ -56,7 +56,7 @@ % extent. You can get the existing language-specific files from the % full Texinfo distribution. % -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. +% The GNU Texinfo home page is https://www.gnu.org/software/texinfo. \message{Loading texinfo [version \texinfoversion]:} @@ -2235,6 +2235,20 @@ end \font\smallersy=cmsy8 \def\smallerecsize{0800} +% Fonts for math mode superscripts (7pt). +\def\sevennominalsize{7pt} +\setfont\sevenrm\rmshape{7}{1000}{OT1} +\setfont\seventt\ttshape{10}{700}{OT1TT} +\setfont\sevenbf\bfshape{10}{700}{OT1} +\setfont\sevenit\itshape{7}{1000}{OT1IT} +\setfont\sevensl\slshape{10}{700}{OT1} +\setfont\sevensf\sfshape{10}{700}{OT1} +\setfont\sevensc\scshape{10}{700}{OT1} +\setfont\seventtsl\ttslshape{10}{700}{OT1TT} +\font\seveni=cmmi7 +\font\sevensy=cmsy7 +\def\sevenecsize{0700} + % Fonts for title page (20.4pt): \def\titlenominalsize{20pt} \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} @@ -2369,6 +2383,20 @@ end \font\smallersy=cmsy8 \def\smallerecsize{0800} +% Fonts for math mode superscripts (7pt). +\def\sevennominalsize{7pt} +\setfont\sevenrm\rmshape{7}{1000}{OT1} +\setfont\seventt\ttshape{10}{700}{OT1TT} +\setfont\sevenbf\bfshape{10}{700}{OT1} +\setfont\sevenit\itshape{7}{1000}{OT1IT} +\setfont\sevensl\slshape{10}{700}{OT1} +\setfont\sevensf\sfshape{10}{700}{OT1} +\setfont\sevensc\scshape{10}{700}{OT1} +\setfont\seventtsl\ttslshape{10}{700}{OT1TT} +\font\seveni=cmmi7 +\font\sevensy=cmsy7 +\def\sevenecsize{0700} + % Fonts for title page (20.4pt): \def\titlenominalsize{20pt} \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} @@ -2503,13 +2531,20 @@ end % In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. We don't -% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. +% we have to define the \textfont of the standard families. +% We don't bother to reset \scriptscriptfont; awaiting user need. % \def\resetmathfonts{% \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont \textfont\ttfam=\ttfont \textfont\sffam=\sffont + % + % Fonts for superscript. Note that the 7pt fonts are used regardless + % of the current font size. + \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy + \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl + \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt + \scriptfont\sffam=\sevensf } % @@ -2519,6 +2554,9 @@ end % to also set the current \fam for math mode. Our \STYLE (e.g., \rm) % commands hardwire \STYLEfont to set the current font. % +% The fonts used for \ifont are for "math italics" (\itfont is for italics +% in regular text). \syfont is also used in math mode only. +% % Each font-changing command also sets the names \lsize (one size lower) % and \lllsize (three sizes lower). These relative commands are used % in, e.g., the LaTeX logo and acronyms. @@ -2619,26 +2657,11 @@ end % 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 +% style. \let\currentmarkupstyle\empty \def\setupmarkupstyle#1{% - \csname markup#1true\endcsname \def\currentmarkupstyle{#1}% \markupstylesetup } @@ -2700,11 +2723,15 @@ end % lilypond developers report. xpdf does work with the regular 0x27. % \def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% + \ifmonospace + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi \else \char'15 \fi - \else \char'15 \fi + \else + '% + \fi } % % and a similar option for the left quote char vs. a grave accent. @@ -2712,13 +2739,17 @@ end % 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`% + \ifmonospace + \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 - \else \char'22 \fi + \else + \relax`% + \fi } % Commands to set the quote options. @@ -5493,17 +5524,15 @@ end \let\indexlbrace\{ % Likewise, set these sequences for braces \let\indexrbrace\} % used in the sort key. \begindoublecolumns - \let\entrywidowpenalty=\indexwidowpenalty + \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty % % Read input from the index file line by line. \loopdo - \ifeof1 - \let\firsttoken\relax - \else + \ifeof1 \else \read 1 to \nextline - \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}% - \act \fi + % + \indexinputprocessing \thisline % \ifeof1\else @@ -5515,12 +5544,20 @@ end \fi \closein 1 \endgroup} +\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} +\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} +\def\indexinputprocessing{% + \ifeof1 + \let\firsttoken\relax + \else + \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}% + \act + \fi +} \def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken} \long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1} -\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} -\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} % These macros are used by the sorted index file itself. % Change them to control the appearance of the index. @@ -5597,7 +5634,7 @@ end % For pdfTeX and XeTeX. % The redefinition of \domark stops marks being added in \pdflink to % preserve coloured links across page boundaries. Otherwise the marks - % would get in the way of \lastbox in \insertindexentrybox. + % would get in the way of \lastbox in \insertentrybox. \let\domark\relax % % Start a new paragraph if necessary, so our assignments below can't @@ -5658,9 +5695,9 @@ end \fi \egroup % end \boxA \ifdim\wd\boxB = 0pt - \global\setbox\entryindexbox=\vbox{\unhbox\boxA}% + \global\setbox\entrybox=\vbox{\unhbox\boxA}% \else - \global\setbox\entryindexbox=\vbox\bgroup + \global\setbox\entrybox=\vbox\bgroup % We want the text of the entries to be aligned to the left, and the % page numbers to be aligned to the right. % @@ -5690,10 +5727,13 @@ end \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly + % Try to split the text roughly evenly. \dimen@ will be the length of + % the first line. + \dimen@ = 0.7\dimen@ \dimen@ii = \hsize \ifnum\dimen@>\dimen@ii - % If the entry is too long, use the whole line + % If the entry is too long (for example, if it needs more than + % two lines), use all the space in the first line. \dimen@ = \dimen@ii \fi \advance\leftskip by 0pt plus 1fill % ragged right @@ -5703,8 +5743,9 @@ end % instead of using \parshape with explicit line lengths, but TeX % doesn't seem to provide a way to do such a thing. % - \leftskip = 1em - \parindent = -1em + % Indent all lines but the first one. + \advance\leftskip by 1em + \advance\parindent by -1em \fi\fi \indent % start paragraph \unhbox\boxA @@ -5722,19 +5763,20 @@ end \egroup % The \vbox \fi \endgroup - % delay text of entry until after penalty - \bgroup\aftergroup\insertindexentrybox - \entrywidowpenalty + \dotheinsertentrybox }} \newskip\thinshrinkable \skip\thinshrinkable=.15em minus .15em -\newbox\entryindexbox -\def\insertindexentrybox{% - \ourunvbox\entryindexbox +\newbox\entrybox +\def\insertentrybox{% + \ourunvbox\entrybox } +% default definition +\let\dotheinsertentrybox\insertentrybox + % Use \lastbox to take apart vbox box by box, and add each sub-box % to the current vertical list. \def\ourunvbox#1{% @@ -5757,21 +5799,18 @@ end \newbox\delayedbox \newbox\interbox -% Default is no penalty -\let\entrywidowpenalty\egroup - % Used from \printindex. \firsttoken should be the first token % after the \entry. If it's not another \entry, we are at the last % line of a group of index entries, so insert a penalty to discourage % widowed index entries. -\long\def\indexwidowpenalty{% - \def\isentry{\entry}% +\def\dotheinsertentryboxwithpenalty{% \ifx\firsttoken\isentry \else \penalty 9000 \fi - \egroup % now comes the box added with \aftergroup + \insertentrybox } +\def\isentry{\entry}% % Like plain.tex's \dotfill, except uses up at least 1 em. % The filll stretch here overpowers both the fil and fill stretch to push @@ -5888,8 +5927,8 @@ end \divide\doublecolumnhsize by 2 \hsize = \doublecolumnhsize % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) + % Double the \vsize as well. + \advance\vsize by -\ht\partialpage \vsize = 2\vsize % % For the benefit of balancing columns @@ -5907,12 +5946,12 @@ end % previous page. \dimen@ = \vsize \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage % % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ + \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@ + \global\advance\vsize by 2\ht\partialpage \onepageout\pagesofar - \unvbox255 + \unvbox\PAGE \penalty\outputpenalty } % @@ -5961,24 +6000,30 @@ end % Split the last of the double-column material. \savemarks \balancecolumns - % + }% + \eject % call the \output just set + \ifdim\pagetotal=0pt % Having called \balancecolumns once, we do not % want to call it again. Therefore, reset \output to its normal % definition right away. \global\output = {\onepageout{\pagecontents\PAGE}}% - }% - \eject - \endgroup % started in \begindoublecolumns - \restoremarks - % Leave the double-column material on the current page, no automatic - % page break. - \box\balancedcolumns - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize + % + \endgroup % started in \begindoublecolumns + \restoremarks + % Leave the double-column material on the current page, no automatic + % page break. + \box\balancedcolumns + % + % \pagegoal was set to the doubled \vsize above, since we restarted + % the current page. We're now back to normal single-column + % typesetting, so reset \pagegoal to the normal \vsize. + \global\vsize = \txipageheight % + \pagegoal = \txipageheight % + \else + % We had some left-over material. This might happen when \doublecolumnout + % is called in \balancecolumns. Try again. + \expandafter\enddoublecolumns + \fi } \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% @@ -5986,13 +6031,14 @@ end % Only called for the last of the double column material. \doublecolumnout % does the others. \def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. + \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. \dimen@ = \ht0 \advance\dimen@ by \topskip \advance\dimen@ by-\baselineskip \ifdim\dimen@<5\baselineskip % Don't split a short final column in two. \setbox2=\vbox{}% + \global\setbox\balancedcolumns=\vbox{\pagesofar}% \else \divide\dimen@ by 2 % target to split to \dimen@ii = \dimen@ @@ -6008,15 +6054,15 @@ end \repeat }% % Now the left column is in box 1, and the right column in box 3. + % % Check whether the left column has come out higher than the page itself. % (Note that we have doubled \vsize for the double columns, so % the actual height of the page is 0.5\vsize). \ifdim2\ht1>\vsize - % Just split the last of the double column material roughly in half. - \setbox2=\box0 - \setbox0 = \vsplit2 to \dimen@ii - \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}% - \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}% + % It appears that we have been called upon to balance too much material. + % Output some of it with \doublecolumnout, leaving the rest on the page. + \setbox\PAGE=\box0 + \doublecolumnout \else % Compare the heights of the two columns. \ifdim4\ht1>5\ht3 @@ -6029,10 +6075,10 @@ end \setbox2=\vbox to\ht1{\unvbox3\unskip}% \setbox0=\vbox to\ht1{\unvbox1\unskip}% \fi + \global\setbox\balancedcolumns=\vbox{\pagesofar}% \fi \fi % - \global\setbox\balancedcolumns=\vbox{\pagesofar}% } \catcode`\@ = \other @@ -6939,7 +6985,15 @@ end % exist, with an empty box. Let's hope all the numbers have the same width. % Also ignore the page number, which is conventionally not printed. \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} +\def\partentry#1#2#3#4{% + % Add stretch and a bonus for breaking the page before the part heading. + % This reduces the chance of the page being broken immediately after the + % part heading, before a following chapter heading. + \vskip 0pt plus 5\baselineskip + \penalty-300 + \vskip 0pt plus -5\baselineskip + \dochapentry{\numeralbox\labelspace#1}{}% +} % % Parts, in the short toc. \def\shortpartentry#1#2#3#4{% @@ -9118,7 +9172,13 @@ end \xdef\safexrefname{#1}% }% % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref + \bgroup + \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% + \egroup + % We put the \gdef inside a group to avoid the definitions building up on + % TeX's save stack, which can cause it to run out of space for aux files with + % thousands of lines. \gdef doesn't use the save stack, but \csname does + % when it defines an unknown control sequence as \relax. % % Was that xref control sequence that we just defined for a float? \expandafter\iffloat\csname XR\safexrefname\endcsname @@ -9424,7 +9484,7 @@ end \newif\ifwarnednoepsf \newhelp\noepsfhelp{epsf.tex must be installed for images to work. It is also included in the Texinfo distribution, or you can get - it from ftp://tug.org/tex/epsf.tex.} + it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.} % \def\image#1{% \ifx\epsfbox\thisisundefined @@ -10999,7 +11059,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2113}{\ensuremath\ell}% \DeclareUnicodeCharacter{2118}{\ensuremath\wp}% \DeclareUnicodeCharacter{211C}{\ensuremath\Re}% - \DeclareUnicodeCharacter{2127}{\ensuremath\mho}% \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}% \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}% \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}% @@ -11015,7 +11074,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}% \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}% \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}% - \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}% \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}% \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}% \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}% @@ -11024,8 +11082,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}% \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}% \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}% - \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}% - \DeclareUnicodeCharacter{2201}{\ensuremath\complement}% \DeclareUnicodeCharacter{2202}{\ensuremath\partial}% \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}% \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}% @@ -11059,8 +11115,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2283}{\ensuremath\supset}% \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}% \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}% - \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}% - \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}% \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}% \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}% \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}% @@ -11075,8 +11129,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}% \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}% \DeclareUnicodeCharacter{22A8}{\ensuremath\models}% - \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}% - \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}% \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}% \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}% \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}% @@ -11092,12 +11144,11 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2322}{\ensuremath\frown}% \DeclareUnicodeCharacter{2323}{\ensuremath\smile}% % - \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}% \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}% \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}% \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}% \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}% - \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}% + \DeclareUnicodeCharacter{25C7}{\ensuremath\diamond}% \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}% \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}% \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}% @@ -11119,7 +11170,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}% \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}% \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}% - \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}% \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}% \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}% \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}% @@ -11274,6 +11324,7 @@ directory should work if nowhere else does.} \pdfvorigin = 1 true in \else \ifx\XeTeXrevision\thisisundefined + \special{papersize=#8,#7}% \else \pdfpageheight #7\relax \pdfpagewidth #8\relax @@ -11311,7 +11362,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.3in \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = .5cm }} @@ -11329,7 +11379,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.25in \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = .4cm }} @@ -11355,7 +11404,6 @@ directory should work if nowhere else does.} {297mm}{210mm}% % \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = 5mm }} @@ -11374,7 +11422,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.2in \tolerance = 800 - \hfuzz = 1.2pt \contentsrightmargin = 0pt \defbodyindent = 2mm \tableindent = 12mm @@ -11416,9 +11463,11 @@ directory should work if nowhere else does.} % \dimen0 = #1\relax \advance\dimen0 by \voffset + \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page % \dimen2 = \hsize \advance\dimen2 by \normaloffset + \advance\dimen2 by 1in % reference point is 1 inch from left edge of page % \internalpagesizes{#1}{\hsize}% {\voffset}{\normaloffset}% @@ -11430,6 +11479,9 @@ directory should work if nowhere else does.} % \letterpaper +% Default value of \hfuzz, for suppressing warnings about overfull hboxes. +\hfuzz = 1pt + \message{and turning on texinfo input format.} @@ -11595,6 +11647,9 @@ directory should work if nowhere else does.} @def ^^M{@let^^M@secondlinenl}% % Definition for a newline in the main Texinfo file. @gdef @secondlinenl{@fixbackslash}% + % In case the first line has a whole-line command on it + @let@originalparsearg@parsearg + @def@parsearg{@fixbackslash@originalparsearg} }} {@catcode`@^=7 @catcode`@^^M=13% @@ -11615,6 +11670,7 @@ directory should work if nowhere else does.} @catcode13=5 % regular end of line @enableemergencynewline @let@c=@texinfoc + @let@parsearg@originalparsearg % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. @catcode`+=@active diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 2d20d21..3bb26ab 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' if 0; # Update an FSF copyright year list to include the current year. -my $VERSION = '2016-01-12.23:13'; # UTC +my $VERSION = '2018-01-04.14:48'; # UTC -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This 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 @@ my $VERSION = '2016-01-12.23:13'; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Written by Jim Meyering and Joel E. Denny @@ -81,6 +81,7 @@ my $VERSION = '2016-01-12.23:13'; # UTC # B. (c) # C. @copyright{} # D. © +# E. © # # 4. The "Copyright" appears at the beginning of a line, except that it # may be prefixed by any sequence (e.g., a comment) of no more than @@ -124,7 +125,7 @@ use strict; use warnings; my $copyright_re = 'Copyright'; -my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)'; +my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©|©)'; my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; $holder ||= 'Free Software Foundation, Inc.'; my $prefix_max = 5; @@ -263,7 +264,9 @@ else print STDERR "$ARGV: warning: copyright statement not found\n"; } +# Hey Emacs! # Local variables: +# coding: utf-8 # mode: perl # indent-tabs-mode: nil # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 4e3f3a2..9325d07 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -4,13 +4,13 @@ eval '(exit $?0)' && eval 'exec perl -wST "$0" "$@"' # Detect instances of "if (p) free (p);". # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces. -my $VERSION = '2016-08-01 17:47'; # UTC +my $VERSION = '2017-09-13 06:45'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ my $VERSION = '2016-08-01 17:47'; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Written by Jim Meyering @@ -33,7 +33,7 @@ use Getopt::Long; (my $ME = $0) =~ s|.*/||; -# use File::Coda; # http://meyering.net/code/Coda/ +# use File::Coda; # https://meyering.net/code/Coda/ END { defined fileno STDOUT or return; close STDOUT and return; diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 2d17eaf..567154d 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -2,9 +2,9 @@ # List version-controlled file names. # Print a version string. -scriptversion=2016-01-11.22; # UTC +scriptversion=2017-09-13.06; # UTC -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # List the specified version-controlled files. @@ -49,7 +49,7 @@ EOF cat < +License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. EOF @@ -65,7 +65,7 @@ test $# = 0 && set . for dir do - if test -d .git; then + if test -d .git || test -f .git; then test "x$dir" = x. \ && dir= sed_esc= \ || { dir="$dir/"; sed_esc=`echo "$dir"|env sed 's,\([\\/]\),\\\\\1,g'`; } diff --git a/configure b/configure index 6dc8e1d..902aa54 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wget 1.19.2. +# Generated by GNU Autoconf 2.69 for wget 1.19.3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wget' PACKAGE_TARNAME='wget' -PACKAGE_VERSION='1.19.2' -PACKAGE_STRING='wget 1.19.2' +PACKAGE_VERSION='1.19.3' +PACKAGE_STRING='wget 1.19.3' PACKAGE_BUGREPORT='bug-wget@gnu.org' PACKAGE_URL='' @@ -630,7 +630,6 @@ with_openssl_default='no' LIB_CRYPTO= gl_fnmatch_required=POSIX gl_getopt_required=POSIX -gl_getopt_required=POSIX ac_subst_vars='gltests_LTLIBOBJS gltests_LIBOBJS gl_LTLIBOBJS @@ -682,11 +681,21 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG LIBOBJS +LIBTESTS_LIBDEPS LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS gltests_WITNESS NEXT_AS_FIRST_DIRECTIVE_WCHAR_H NEXT_WCHAR_H +GL_GENERATE_UTIME_H_FALSE +GL_GENERATE_UTIME_H_TRUE +UTIME_H +HAVE_UTIME_H +NEXT_AS_FIRST_DIRECTIVE_UTIME_H +NEXT_UTIME_H +REPLACE_UTIME +HAVE_UTIME +GNULIB_UTIME LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE LIBUNISTRING_UNIWIDTH_H @@ -767,7 +776,6 @@ NEXT_SIGNAL_H GL_GENERATE_SCHED_H_FALSE GL_GENERATE_SCHED_H_TRUE SCHED_H -HAVE_SYS_CDEFS_H HAVE_STRUCT_SCHED_PARAM HAVE_SCHED_H NEXT_AS_FIRST_DIRECTIVE_SCHED_H @@ -834,34 +842,18 @@ REPLACE_PSELECT HAVE_PSELECT GNULIB_SELECT GNULIB_PSELECT -REPLACE_LOCALTIME -REPLACE_GMTIME -REPLACE_TIMEGM -REPLACE_NANOSLEEP -REPLACE_MKTIME -REPLACE_LOCALTIME_R -HAVE_TIMEGM -HAVE_STRPTIME -HAVE_NANOSLEEP -HAVE_DECL_LOCALTIME_R -GNULIB_TIME_RZ -GNULIB_TIME_R -GNULIB_TIMEGM -GNULIB_STRPTIME -GNULIB_NANOSLEEP -GNULIB_MKTIME UNDEFINE_STRTOK_R -REPLACE_STRTOK_R REPLACE_STRSIGNAL -REPLACE_STRNLEN -REPLACE_STRNDUP -REPLACE_STRNCAT REPLACE_STRERROR_R REPLACE_STRERROR -REPLACE_STRCHRNUL +REPLACE_STRTOK_R REPLACE_STRCASESTR REPLACE_STRSTR +REPLACE_STRNLEN +REPLACE_STRNDUP +REPLACE_STRNCAT REPLACE_STRDUP +REPLACE_STRCHRNUL REPLACE_STPNCPY REPLACE_MEMMEM REPLACE_MEMCHR @@ -885,6 +877,7 @@ HAVE_DECL_MEMMEM HAVE_MEMCHR HAVE_FFSLL HAVE_FFSL +HAVE_EXPLICIT_BZERO HAVE_MBSLEN GNULIB_STRVERSCMP GNULIB_STRSIGNAL @@ -923,6 +916,7 @@ GNULIB_MEMMEM GNULIB_MEMCHR GNULIB_FFSLL GNULIB_FFSL +GNULIB_EXPLICIT_BZERO LOCALE_FR_UTF8 LOCALE_ZH_CN LOCALE_JA @@ -949,11 +943,13 @@ HAVE_STRUCT_RANDOM_DATA HAVE_STRTOULL HAVE_STRTOLL HAVE_STRTOD +HAVE_DECL_SETSTATE HAVE_DECL_SETENV HAVE_SETENV HAVE_SECURE_GETENV HAVE_RPMATCH HAVE_REALPATH +HAVE_REALLOCARRAY HAVE_RANDOM_R HAVE_RANDOM_H HAVE_RANDOM @@ -966,6 +962,7 @@ HAVE_MKSTEMP HAVE_MKOSTEMPS HAVE_MKOSTEMP HAVE_MKDTEMP +HAVE_DECL_INITSTATE HAVE_GRANTPT HAVE_GETSUBOPT HAVE_DECL_GETLOADAVG @@ -984,6 +981,7 @@ GNULIB_SECURE_GETENV GNULIB_RPMATCH GNULIB_REALPATH GNULIB_REALLOC_POSIX +GNULIB_REALLOCARRAY GNULIB_RANDOM_R GNULIB_RANDOM GNULIB_QSORT_R @@ -1052,6 +1050,7 @@ REPLACE_ISWCNTRL HAVE_WCTYPE_H NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H NEXT_WCTYPE_H +HAVE_CRTDEFS_H HAVE_WINT_T HAVE_ISWCNTRL REPLACE_ISWBLANK @@ -1125,17 +1124,43 @@ REPLACE_ICONV_OPEN REPLACE_ICONV ICONV_CONST GNULIB_ICONV +REPLACE_LOCALTIME +REPLACE_GMTIME +REPLACE_TZSET +REPLACE_TIMEGM +REPLACE_STRFTIME +REPLACE_NANOSLEEP +REPLACE_MKTIME +REPLACE_LOCALTIME_R +REPLACE_CTIME +HAVE_TIMEZONE_T +HAVE_TZSET +HAVE_TIMEGM +HAVE_STRPTIME +HAVE_NANOSLEEP +HAVE_DECL_LOCALTIME_R +GNULIB_TZSET +GNULIB_TIME_RZ +GNULIB_TIME_R +GNULIB_TIMEGM +GNULIB_STRPTIME +GNULIB_STRFTIME +GNULIB_NANOSLEEP +GNULIB_LOCALTIME +GNULIB_MKTIME +GNULIB_CTIME NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H NEXT_SYS_TIME_H REPLACE_STRUCT_TIMEVAL REPLACE_GETTIMEOFDAY -HAVE_TIMEZONE_T HAVE_SYS_TIME_H HAVE_STRUCT_TIMEVAL HAVE_GETTIMEOFDAY GNULIB_GETTIMEOFDAY GNULIB_GL_UNISTD_H_GETOPT +GETOPT_CDEFS_H GETOPT_H +HAVE_SYS_CDEFS_H HAVE_GETOPT_H NEXT_AS_FIRST_DIRECTIVE_GETOPT_H NEXT_GETOPT_H @@ -1154,6 +1179,7 @@ HAVE_DECL_FREEADDRINFO HAVE_STRUCT_ADDRINFO GNULIB_GETADDRINFO WINDOWS_64_BIT_ST_SIZE +WINDOWS_STAT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H NEXT_SYS_STAT_H REPLACE_UTIMENSAT @@ -1176,6 +1202,7 @@ HAVE_LCHMOD HAVE_FUTIMENS HAVE_FSTATAT HAVE_FCHMODAT +GNULIB_OVERRIDES_STRUCT_STAT GNULIB_UTIMENSAT GNULIB_STAT GNULIB_MKNODAT @@ -1189,6 +1216,7 @@ GNULIB_FUTIMENS GNULIB_FSTATAT GNULIB_FSTAT GNULIB_FCHMODAT +WINDOWS_STAT_INODES WINDOWS_64_BIT_OFF_T NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H NEXT_SYS_TYPES_H @@ -1328,10 +1356,12 @@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H NEXT_ERRNO_H LIB_CRYPTO pkglibexecdir +runstatedir lispdir HAVE_MSVC_INVALID_PARAMETER_HANDLER LIB_CLOCK_GETTIME LOCALE_FR +REPLACE_WCSFTIME REPLACE_WCSWIDTH REPLACE_WCWIDTH REPLACE_WCSNRTOMBS @@ -1347,6 +1377,7 @@ REPLACE_BTOWC REPLACE_MBSTATE_T HAVE_DECL_WCWIDTH HAVE_DECL_WCTOB +HAVE_WCSFTIME HAVE_WCSWIDTH HAVE_WCSTOK HAVE_WCSSTR @@ -1384,6 +1415,7 @@ HAVE_MBRLEN HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC +GNULIB_WCSFTIME GNULIB_WCSWIDTH GNULIB_WCSTOK GNULIB_WCSSTR @@ -1449,6 +1481,7 @@ REPLACE_USLEEP REPLACE_UNLINKAT REPLACE_UNLINK REPLACE_TTYNAME_R +REPLACE_TRUNCATE REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP @@ -1471,6 +1504,7 @@ REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FTRUNCATE REPLACE_FCHOWNAT +REPLACE_FACCESSAT REPLACE_DUP2 REPLACE_DUP REPLACE_CLOSE @@ -1489,6 +1523,7 @@ HAVE_DECL_FCHDIR HAVE_DECL_ENVIRON HAVE_USLEEP HAVE_UNLINKAT +HAVE_TRUNCATE HAVE_SYMLINKAT HAVE_SYMLINK HAVE_SLEEP @@ -1525,6 +1560,7 @@ GNULIB_UNLINK GNULIB_UNISTD_H_SIGPIPE GNULIB_UNISTD_H_NONBLOCKING GNULIB_TTYNAME_R +GNULIB_TRUNCATE GNULIB_SYMLINKAT GNULIB_SYMLINK GNULIB_SLEEP @@ -1605,6 +1641,8 @@ INTLLIBS LTLIBICONV LIBICONV INTL_MACOSX_LIBS +HOST_CPU_C_ABI +HOST_CPU XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 @@ -1629,7 +1667,6 @@ PYTHON_VERSION PYTHON RANLIB ARFLAGS -ac_ct_AR AR EGREP GREP @@ -1707,7 +1744,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1832,7 +1868,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2085,15 +2120,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2231,7 +2257,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2344,7 +2370,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 wget 1.19.2 to adapt to many kinds of systems. +\`configure' configures wget 1.19.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2384,7 +2410,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2415,7 +2440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wget 1.19.2:";; + short | recursive ) echo "Configuration of wget 1.19.3:";; esac cat <<\_ACEOF @@ -2587,7 +2612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wget configure 1.19.2 +wget configure 1.19.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3296,7 +3321,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 wget $as_me 1.19.2, which was +It was created by wget $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3602,6 +3627,7 @@ as_fn_append ac_func_list " getdelim" as_fn_append ac_func_list " getdtablesize" gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" +as_fn_append ac_header_list " sys/cdefs.h" as_fn_append ac_header_list " stdio_ext.h" as_fn_append ac_header_list " termios.h" as_fn_append ac_func_list " __fsetlocking" @@ -3618,6 +3644,7 @@ as_fn_append ac_header_list " wchar.h" as_fn_append ac_header_list " stdint.h" as_fn_append ac_header_list " inttypes.h" as_fn_append ac_func_list " iswcntrl" +as_fn_append ac_header_list " crtdefs.h" as_fn_append ac_func_list " iswblank" as_fn_append ac_header_list " langinfo.h" as_fn_append ac_func_list " link" @@ -3636,7 +3663,6 @@ as_fn_append ac_header_list " sys/param.h" as_fn_append ac_func_list " pipe" as_fn_append ac_func_list " pipe2" as_fn_append ac_header_list " malloc.h" -as_fn_append ac_header_list " sys/cdefs.h" as_fn_append ac_func_list " secure_getenv" as_fn_append ac_func_list " getuid" as_fn_append ac_func_list " geteuid" @@ -3648,6 +3674,7 @@ as_fn_append ac_func_list " siginterrupt" as_fn_append ac_func_list " snprintf" as_fn_append ac_header_list " spawn.h" as_fn_append ac_func_list " strdup" +as_fn_append ac_func_list " strerror_r" as_fn_append ac_func_list " __xpg_strerror_r" as_fn_append ac_func_list " catgets" as_fn_append ac_header_list " strings.h" @@ -3659,6 +3686,7 @@ as_fn_append ac_header_list " sys/uio.h" as_fn_append ac_header_list " sys/wait.h" as_fn_append ac_func_list " localtime_r" as_fn_append ac_func_list " timegm" +as_fn_append ac_func_list " utime" as_fn_append ac_header_list " utime.h" as_fn_append ac_func_list " futimes" as_fn_append ac_func_list " futimesat" @@ -4260,7 +4288,7 @@ fi # Define the identity of the package. PACKAGE='wget' - VERSION='1.19.2' + VERSION='1.19.3' cat >>confdefs.h <<_ACEOF @@ -6148,6 +6176,10 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h + + $as_echo "#define _OPENBSD_SOURCE 1" >>confdefs.h + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h @@ -6220,12 +6252,6 @@ $as_echo "$ac_cv_should_define__xopen_source" >&6; } - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 $as_echo_n "checking for Minix Amsterdam compiler... " >&6; } if ${gl_cv_c_amsterdam_compiler+:} false; then : @@ -6261,177 +6287,7 @@ $as_echo "$gl_cv_c_amsterdam_compiler" >&6; } ARFLAGS='-o' fi else - if test -n "$ac_tool_prefix"; then - for ac_prog in ar lib "link -lib" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar lib "link -lib" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 -$as_echo_n "checking the archiver ($AR) interface... " >&6; } -if ${am_cv_ar_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - am_cv_ar_interface=ar - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int some_variable = 0; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 - (eval $am_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - am_cv_ar_interface=ar - else - am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 - (eval $am_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - am_cv_ar_interface=lib - else - am_cv_ar_interface=unknown - fi - fi - rm -f conftest.lib libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 -$as_echo "$am_cv_ar_interface" >&6; } - -case $am_cv_ar_interface in -ar) - ;; -lib) - # Microsoft lib, so override with the ar-lib wrapper script. - # FIXME: It is wrong to rewrite AR. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__AR in this case, - # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something - # similar. - AR="$am_aux_dir/ar-lib $AR" - ;; -unknown) - as_fn_error $? "could not determine $AR interface" "$LINENO" 5 - ;; -esac - + : fi if test -n "$ac_tool_prefix"; then @@ -6952,10 +6808,6 @@ fi - # Pre-early section. - - - # Code from module absolute-header: # Code from module accept: @@ -7000,6 +6852,7 @@ fi # Code from module fcntl-h: # Code from module fd-hook: # Code from module fd-safer-flag: + # Code from module filename: # Code from module flexmember: # Code from module float: # Code from module flock: @@ -7036,6 +6889,7 @@ fi # Code from module group-member: # Code from module hard-locale: # Code from module havelib: + # Code from module host-cpu-c-abi: # Code from module hostent: # Code from module iconv: # Code from module iconv-h: @@ -7057,11 +6911,13 @@ fi # Code from module localcharset: # Code from module locale: # Code from module localeconv: + # Code from module localtime-buffer: # Code from module lock: # Code from module lseek: # Code from module lstat: # Code from module maintainer-makefile: # Code from module malloc-posix: + # Code from module malloca: # Code from module mbchar: # Code from module mbiter: # Code from module mbrtowc: @@ -7206,6 +7062,8 @@ fi # Code from module unlocked-io: # Code from module update-copyright: # Code from module useless-if-before-free: + # Code from module utime: + # Code from module utime-h: # Code from module utimens: # Code from module vasnprintf: # Code from module vasprintf: @@ -7268,7 +7126,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -7805,38 +7663,12 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 +$as_echo_n "checking for ld... " >&6; } +elif test "$GCC" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` - while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac elif test "$with_gnu_ld" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } @@ -7844,44 +7676,129 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if ${acl_cv_path_LD+:} false; then : +if test -n "$LD"; then + # Let the user override the test with a path. + : +else + if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else - if test -z "$LD"; then - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 &5 | tr -d '\015'` ;; + *) + acl_output=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $acl_output in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` + while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do + acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` + done + # Got the pathname. No search in PATH is needed. + acl_cv_path_LD="$acl_output" + ac_prog= + ;; + "") + # If it fails, then pretend we aren't using GCC. + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; esac fi - done - IFS="$acl_save_ifs" + if test -n "$ac_prog"; then + # Search for $ac_prog in $PATH. + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 conftest.$ac_ext +/* end confdefs.h. */ +#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # The compiler produces 64-bit code. Add option '-b64' so that the + # linker groks 64-bit object files. + case "$acl_cv_path_LD " in + *" -b64 "*) ;; + *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;; + esac + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + sparc64-*-netbsd*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + else - acl_cv_path_LD="$LD" # Let the user override the test with a path. + # The compiler produces 32-bit code. Add option '-m elf32_sparc' + # so that the linker groks 32-bit object files. + case "$acl_cv_path_LD " in + *" -m elf32_sparc "*) ;; + *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; + esac + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + esac + fi -LD="$acl_cv_path_LD" + LD="$acl_cv_path_LD" +fi if test -n "$LD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if ${acl_cv_prog_gnu_ld+:} false; then : @@ -7937,67 +7854,427 @@ fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _MSC_VER +MicrosoftCompiler +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "MicrosoftCompiler" >/dev/null 2>&1; then : + gl_asmext='asm' + gl_c_asm_opt='-c -Fa' + +else + gl_asmext='s' + gl_c_asm_opt='-S' + +fi +rm -f conftest* + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host CPU and C ABI" >&5 +$as_echo_n "checking host CPU and C ABI... " >&6; } +if ${gl_cv_host_cpu_c_abi+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_cpu" in + + i[4567]86 ) + gl_cv_host_cpu_c_abi=i386 + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=x86_64-x32 +else + gl_cv_host_cpu_c_abi=x86_64 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + gl_cv_host_cpu_c_abi=i386 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + gl_cv_host_cpu_c_abi=alpha + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __aarch64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=arm64-ilp32 +else + gl_cv_host_cpu_c_abi=arm64 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + # Don't distinguish little-endian and big-endian arm, since they + # don't require different machine code for simple operations and + # since the user can distinguish them through the preprocessor + # defines __ARMEL__ vs. __ARMEB__. + # But distinguish arm which passes floating-point arguments and + # return values in integer registers (r0, r1, ...) - this is + # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which + # passes them in float registers (s0, s1, ...) and double registers + # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer + # sets the preprocessor defines __ARM_PCS (for the first case) and + # __ARM_PCS_VFP (for the second case), but older GCC does not. + echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c + # Look for a reference to the register d0 in the .s file. + { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } >/dev/null 2>&1 + if LC_ALL=C grep -E 'd0,' conftest.$gl_asmext >/dev/null; then + gl_cv_host_cpu_c_abi=armhf + else + gl_cv_host_cpu_c_abi=arm + fi + rm -f conftest* + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __LP64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=hppa64 +else + gl_cv_host_cpu_c_abi=hppa +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef _ILP32 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=ia64-ilp32 +else + gl_cv_host_cpu_c_abi=ia64 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=mips64 +else + # In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIN32. + # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIO32. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if (_MIPS_SIM == _ABIN32) + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=mipsn32 +else + gl_cv_host_cpu_c_abi=mips +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # On powerpc64, there are two ABIs on Linux: The AIX compatible + # one and the ELFv2 one. The latter defines _CALL_ELF=2. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined _CALL_ELF && _CALL_ELF == 2 + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=powerpc64-elfv2 +else + gl_cv_host_cpu_c_abi=powerpc64 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + gl_cv_host_cpu_c_abi=powerpc +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi=powerpc + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=s390x +else + gl_cv_host_cpu_c_abi=s390 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_host_cpu_c_abi=sparc64 +else + gl_cv_host_cpu_c_abi=sparc +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + + *) + gl_cv_host_cpu_c_abi="$host_cpu" + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi" >&5 +$as_echo "$gl_cv_host_cpu_c_abi" >&6; } + + HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'` + HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi" + + + + # This was + # AC_DEFINE_UNQUOTED([__${HOST_CPU}__]) + # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__]) + # earlier, but KAI C++ 3.2d doesn't like this. + sed -e 's/-/_/g' >> confdefs.h <&5 +$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; } +if ${acl_cv_libdirstems+:} false; then : + $as_echo_n "(cached) " >&6 +else acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 $as_echo_n "checking for 64-bit host... " >&6; } if ${gl_cv_solaris_64bit+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #ifdef _LP64 -sixtyfour bits -#endif + int ok; + #else + error fail + #endif _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "sixtyfour bits" >/dev/null 2>&1; then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_solaris_64bit=yes else gl_cv_solaris_64bit=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 $as_echo "$gl_cv_solaris_64bit" >&6; } - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + case "$gl_cv_host_cpu_c_abi" in + i386 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | s390 | sparc) + ;; + *) # x86_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64* | s390x | sparc64 | ... + searchpath=`(if test -f /usr/bin/gcc \ + && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ + LC_ALL=C /usr/bin/gcc -print-search-dirs; \ + else \ + LC_ALL=C $CC -print-search-dirs; \ + fi) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 +$as_echo "$acl_cv_libdirstems" >&6; } + # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. + acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` + acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` @@ -8846,15 +9123,27 @@ int result = 0; #endif /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - result |= 16; + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } return result; ; @@ -10384,8 +10673,8 @@ else char o[sizeof n == m * sizeof n[0] ? 1 : -1]; char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html */ Bool q = true; Bool *pq = &q; @@ -10949,6 +11238,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; } GNULIB_SLEEP=0; GNULIB_SYMLINK=0; GNULIB_SYMLINKAT=0; + GNULIB_TRUNCATE=0; GNULIB_TTYNAME_R=0; GNULIB_UNISTD_H_NONBLOCKING=0; GNULIB_UNISTD_H_SIGPIPE=0; @@ -10985,6 +11275,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; } HAVE_SLEEP=1; HAVE_SYMLINK=1; HAVE_SYMLINKAT=1; + HAVE_TRUNCATE=1; HAVE_UNLINKAT=1; HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; @@ -11003,6 +11294,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; } REPLACE_CLOSE=0; REPLACE_DUP=0; REPLACE_DUP2=0; + REPLACE_FACCESSAT=0; REPLACE_FCHOWNAT=0; REPLACE_FTRUNCATE=0; REPLACE_GETCWD=0; @@ -11025,6 +11317,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; } REPLACE_SLEEP=0; REPLACE_SYMLINK=0; REPLACE_SYMLINKAT=0; + REPLACE_TRUNCATE=0; REPLACE_TTYNAME_R=0; REPLACE_UNLINK=0; REPLACE_UNLINKAT=0; @@ -11666,6 +11959,7 @@ _ACEOF GNULIB_WCSSTR=0; GNULIB_WCSTOK=0; GNULIB_WCSWIDTH=0; + GNULIB_WCSFTIME=0; HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -11703,6 +11997,7 @@ _ACEOF HAVE_WCSSTR=1; HAVE_WCSTOK=1; HAVE_WCSWIDTH=1; + HAVE_WCSFTIME=1; HAVE_DECL_WCTOB=1; HAVE_DECL_WCWIDTH=1; REPLACE_MBSTATE_T=0; @@ -11718,6 +12013,7 @@ _ACEOF REPLACE_WCSNRTOMBS=0; REPLACE_WCWIDTH=0; REPLACE_WCSWIDTH=0; + REPLACE_WCSFTIME=0; { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 @@ -11789,7 +12085,7 @@ This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in C99 mode. You have four options: - Add the flag -fgnu89-inline to CC and reconfigure, or - Fix your include files, using parts of - , or + , or - Use a gcc version older than 4.3, or - Don't use the flags -std=c99 or -std=gnu99. Configuration aborted." "$LINENO" 5 @@ -11868,8 +12164,14 @@ else 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -11877,9 +12179,9 @@ int main () { if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -11888,32 +12190,33 @@ int main () { some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# 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; -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ +# if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ /* 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; -#endif +# endif return 0; +#endif } _ACEOF @@ -11985,6 +12288,12 @@ $as_echo "$gt_cv_locale_fr" >&6; } + + + + + + if test $ac_cv_func__set_invalid_parameter_handler = yes; then HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 @@ -12693,16 +13002,97 @@ $as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; } fi +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_strerror_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R $ac_have_decl +_ACEOF -$as_echo "#define HAVE_DECL_STRERROR_R 1" >>confdefs.h +for ac_func in strerror_r +do : + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR_R 1 +_ACEOF +fi +done -$as_echo "#define HAVE_STRERROR_R 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5 +$as_echo_n "checking whether strerror_r returns char *... " >&6; } +if ${ac_cv_func_strerror_r_char_p+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_func_strerror_r_char_p=no + if test $ac_cv_have_decl_strerror_r = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ -$as_echo "#define STRERROR_R_CHAR_P 0" >>confdefs.h + char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + char *p = strerror_r (0, buf, sizeof buf); + return !p || x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + # strerror_r is not declared. Choose between + # systems that have relatively inaccessible declarations for the + # function. BeOS and DEC UNIX 4.0 fall in this category, but the + # former has a strerror_r that returns char*, while the latter + # has a strerror_r that returns `int'. + # This test should segfault on the DEC system. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default + extern char *strerror_r (); +int +main () +{ +char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + return ! isalpha (x); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strerror_r_char_p=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5 +$as_echo "$ac_cv_func_strerror_r_char_p" >&6; } +if test $ac_cv_func_strerror_r_char_p = yes; then + +$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h + +fi XGETTEXT_EXTRA_OPTIONS= @@ -12753,7 +13143,12 @@ if ${gl_cv_header_working_fcntl_h+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_header_working_fcntl_h=cross-compiling + case "$host_os" in + # Guess 'no' on native Windows. + mingw*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12864,6 +13259,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5 $as_echo "$gl_cv_header_working_fcntl_h" >&6; } @@ -13144,7 +13540,40 @@ $as_echo "$gl_cv_type_off_t_64" >&6; } else WINDOWS_64_BIT_OFF_T=0 fi - WINDOWS_64_BIT_ST_SIZE=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5 +$as_echo_n "checking for 64-bit st_size... " >&6; } +if ${gl_cv_member_st_size_64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct stat buf; + int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_member_st_size_64=yes +else + gl_cv_member_st_size_64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 +$as_echo "$gl_cv_member_st_size_64" >&6; } + if test $gl_cv_member_st_size_64 = no; then + WINDOWS_64_BIT_ST_SIZE=1 + else + WINDOWS_64_BIT_ST_SIZE=0 + fi ;; *) WINDOWS_64_BIT_OFF_T=0 @@ -13160,6 +13589,10 @@ $as_echo "$gl_cv_type_off_t_64" >&6; } +$as_echo "#define _USE_STD_STAT 1" >>confdefs.h + + + @@ -13238,6 +13671,11 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; } + + WINDOWS_STAT_INODES=0 + + + ac_fn_c_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_default" if test "x$ac_cv_have_decl_fseeko" = xyes; then : ac_have_decl=1 @@ -13318,6 +13756,7 @@ $as_echo "$gl_cv_func_fseeko" >&6; } GNULIB_MKNODAT=0; GNULIB_STAT=0; GNULIB_UTIMENSAT=0; + GNULIB_OVERRIDES_STRUCT_STAT=0; HAVE_FCHMODAT=1; HAVE_FSTATAT=1; HAVE_FUTIMENS=1; @@ -13470,14 +13909,14 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; } + WINDOWS_STAT_TIMESPEC=0 + + - if test $WINDOWS_64_BIT_ST_SIZE = 1; then -$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h - fi ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include #include @@ -13604,6 +14043,8 @@ else case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_ftello_works="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_ftello_works="guessing yes" ;; esac @@ -13627,7 +14068,7 @@ main (void) if (fp == NULL) return 70; if (fwrite ("foogarsh", 1, 8, fp) < 8) - return 71; + { fclose (fp); return 71; } if (fclose (fp)) return 72; @@ -13638,19 +14079,19 @@ main (void) if (fp == NULL) return 73; if (fseek (fp, -1, SEEK_END)) - return 74; + { fclose (fp); return 74; } if (!(getc (fp) == 'h')) - return 1; + { fclose (fp); return 1; } if (!(getc (fp) == EOF)) - return 2; + { fclose (fp); return 2; } if (!(ftell (fp) == 8)) - return 3; + { fclose (fp); return 3; } if (!(ftell (fp) == 8)) - return 4; + { fclose (fp); return 4; } if (!(putc ('!', fp) == '!')) - return 5; + { fclose (fp); return 5; } if (!(ftell (fp) == 9)) - return 6; + { fclose (fp); return 6; } if (!(fclose (fp) == 0)) return 7; fp = fopen (TESTFILE, "r"); @@ -13659,9 +14100,9 @@ main (void) { char buf[10]; if (!(fread (buf, 1, 10, fp) == 9)) - return 10; + { fclose (fp); return 10; } if (!(memcmp (buf, "foogarsh!", 9) == 0)) - return 11; + { fclose (fp); return 11; } } if (!(fclose (fp) == 0)) return 12; @@ -14077,7 +14518,7 @@ done - HAVE_INET_NTOP=1 + HAVE_INET_NTOP=1 INET_NTOP_LIB= @@ -14152,7 +14593,7 @@ return inet_ntop (); return 0; } _ACEOF -for ac_lib in '' nsl resolv; do +for ac_lib in '' nsl resolv network; do if test -z "$ac_lib"; then ac_res="none required" else @@ -15063,35 +15504,6 @@ $as_echo "$gl_cv_func_getopt_long_gnu" >&6; } - - - - REPLACE_GETOPT=0 - if test -n "$gl_replace_getopt"; then - REPLACE_GETOPT=1 - fi - - if test $REPLACE_GETOPT = 1; then - - GETOPT_H=getopt.h - -$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h - - - - fi - -ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" -if test "x$ac_cv_have_decl_getenv" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV $ac_have_decl -_ACEOF - ac_fn_c_check_decl "$LINENO" "getpass" "ac_cv_have_decl_getpass" "$ac_includes_default" if test "x$ac_cv_have_decl_getpass" = xyes; then : ac_have_decl=1 @@ -15182,7 +15594,6 @@ _ACEOF HAVE_GETTIMEOFDAY=1; HAVE_STRUCT_TIMEVAL=1; HAVE_SYS_TIME_H=1; - HAVE_TIMEZONE_T=0; REPLACE_GETTIMEOFDAY=0; REPLACE_STRUCT_TIMEVAL=0; @@ -15429,6 +15840,38 @@ fi + NEED_LOCALTIME_BUFFER=0 + + + GNULIB_CTIME=0; + GNULIB_MKTIME=0; + GNULIB_LOCALTIME=0; + GNULIB_NANOSLEEP=0; + GNULIB_STRFTIME=0; + GNULIB_STRPTIME=0; + GNULIB_TIMEGM=0; + GNULIB_TIME_R=0; + GNULIB_TIME_RZ=0; + GNULIB_TZSET=0; + HAVE_DECL_LOCALTIME_R=1; + HAVE_NANOSLEEP=1; + HAVE_STRPTIME=1; + HAVE_TIMEGM=1; + HAVE_TZSET=1; + HAVE_TIMEZONE_T=0; + REPLACE_CTIME=GNULIB_PORTCHECK; + REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; + REPLACE_MKTIME=GNULIB_PORTCHECK; + REPLACE_NANOSLEEP=GNULIB_PORTCHECK; + REPLACE_STRFTIME=GNULIB_PORTCHECK; + REPLACE_TIMEGM=GNULIB_PORTCHECK; + REPLACE_TZSET=GNULIB_PORTCHECK; + + : ${GNULIB_GETTIMEOFDAY=0}; + REPLACE_GMTIME=0; + REPLACE_LOCALTIME=0; + + GNULIB_ICONV=0; ICONV_CONST=; REPLACE_ICONV=0; @@ -15649,15 +16092,27 @@ int result = 0; #endif /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - result |= 16; + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } return result; ; @@ -16449,7 +16904,12 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : if test "$cross_compiling" = yes; then : - gl_cv_header_working_stdint_h=yes + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16549,15 +17009,16 @@ $as_echo "$gl_cv_header_working_stdint_h" >&6; } HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then - HAVE_C99_STDINT_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 + case "$gl_cv_header_working_stdint_h" in + *yes) + HAVE_C99_STDINT_H=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 $as_echo_n "checking whether stdint.h predates C++11... " >&6; } if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_header_stdint_predates_cxx11_h=yes - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16595,29 +17056,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5 $as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; } - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then $as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h $as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 $as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } if ${gl_cv_header_stdint_width+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_header_stdint_width=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - /* Work if build is not clean. */ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 - #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include /* BSD/OS 4.0.1 has a bug: , and must be included before . */ @@ -16629,7 +17090,7 @@ else # include #endif - int iw = UINTMAX_WIDTH; + int iw = UINTMAX_WIDTH; int main () @@ -16646,11 +17107,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 $as_echo "$gl_cv_header_stdint_width" >&6; } - if test "$gl_cv_header_stdint_width" = yes; then - STDINT_H= - fi - else - for ac_header in sys/inttypes.h sys/bitypes.h + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi + ;; + *) + for ac_header in sys/inttypes.h sys/bitypes.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -16663,12 +17125,12 @@ fi done - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - fi - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - fi + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + fi + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + fi if test $APPLE_UNIVERSAL_BUILD = 0; then @@ -16968,7 +17430,8 @@ _ACEOF BITSIZEOF_WINT_T=32 fi - fi + ;; + esac LIMITS_H=limits.h if test -n "$LIMITS_H"; then @@ -17216,6 +17679,17 @@ _ACEOF + if test $ac_cv_header_crtdefs_h = yes; then + HAVE_CRTDEFS_H=1 + else + HAVE_CRTDEFS_H=0 + fi + + + + + + if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 @@ -17241,6 +17715,8 @@ _ACEOF + + if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else @@ -17319,7 +17795,7 @@ if ${gl_cv_func_iswcntrl_works+:} false; then : else if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #if __GNU_LIBRARY__ == 1 @@ -19686,6 +20162,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 @@ -19712,7 +20191,7 @@ fi # # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: - # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html save_LIBS=$LIBS for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" @@ -20542,7 +21021,7 @@ $as_echo "$gl_threads_api" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then : $as_echo_n "(cached) " >&6 @@ -20551,9 +21030,12 @@ else echo >conftest.file if test "$cross_compiling" = yes; then : case "$host_os" in - *-gnu*) + *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + mingw*) + # Guess no on native Windows. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) # If we don't know, assume the worst. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; @@ -20624,6 +21106,7 @@ _ACEOF GNULIB_QSORT_R=0; GNULIB_RANDOM=0; GNULIB_RANDOM_R=0; + GNULIB_REALLOCARRAY=0; GNULIB_REALLOC_POSIX=0; GNULIB_REALPATH=0; GNULIB_RPMATCH=0; @@ -20642,6 +21125,7 @@ _ACEOF HAVE_DECL_GETLOADAVG=1; HAVE_GETSUBOPT=1; HAVE_GRANTPT=1; + HAVE_DECL_INITSTATE=1; HAVE_MKDTEMP=1; HAVE_MKOSTEMP=1; HAVE_MKOSTEMPS=1; @@ -20654,11 +21138,13 @@ _ACEOF HAVE_RANDOM=1; HAVE_RANDOM_H=1; HAVE_RANDOM_R=1; + HAVE_REALLOCARRAY=1; HAVE_REALPATH=1; HAVE_RPMATCH=1; HAVE_SECURE_GETENV=1; HAVE_SETENV=1; HAVE_DECL_SETENV=1; + HAVE_DECL_SETSTATE=1; HAVE_STRTOD=1; HAVE_STRTOLL=1; HAVE_STRTOULL=1; @@ -20717,6 +21203,81 @@ $as_echo "$gl_cv_func_malloc_posix" >&6; } + for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess yes on platforms where we know the result. + *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) + ac_cv_func_malloc_0_nonnull=yes ;; + # If we don't know, assume the worst. + *) ac_cv_func_malloc_0_nonnull=no ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H + # include + #else + char *malloc (); + #endif + +int +main () +{ +char *p = malloc (0); + int result = !p; + free (p); + return result; + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_malloc_0_nonnull=yes +else + 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.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$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 + + + + @@ -20742,9 +21303,14 @@ struct tm t; char buf[16]; int main () { - const char *p; + /* 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -20752,9 +21318,9 @@ int main () if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -20763,32 +21329,36 @@ int main () some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# 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 (except on MirBSD). */ - 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; + { + const char *p; + 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; +#endif } _ACEOF @@ -20882,9 +21452,14 @@ struct tm t; char buf[16]; int main () { - const char *p; + /* 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -20892,9 +21467,9 @@ int main () if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -20903,32 +21478,36 @@ int main () some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# endif /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. This excludes the UTF-8 encoding (except on MirBSD). */ - 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; + { + const char *p; + 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; +#endif } _ACEOF @@ -21124,6 +21703,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } + GNULIB_EXPLICIT_BZERO=0; GNULIB_FFSL=0; GNULIB_FFSLL=0; GNULIB_MEMCHR=0; @@ -21162,7 +21742,8 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } GNULIB_STRSIGNAL=0; GNULIB_STRVERSCMP=0; HAVE_MBSLEN=0; - HAVE_FFSL=1; + HAVE_EXPLICIT_BZERO=1; + HAVE_FFSL=1; HAVE_FFSLL=1; HAVE_MEMCHR=1; HAVE_DECL_MEMMEM=1; @@ -21185,23 +21766,24 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } REPLACE_MEMCHR=0; REPLACE_MEMMEM=0; REPLACE_STPNCPY=0; + REPLACE_STRCHRNUL=0; REPLACE_STRDUP=0; + REPLACE_STRNCAT=0; + REPLACE_STRNDUP=0; + REPLACE_STRNLEN=0; REPLACE_STRSTR=0; REPLACE_STRCASESTR=0; - REPLACE_STRCHRNUL=0; + REPLACE_STRTOK_R=0; REPLACE_STRERROR=0; REPLACE_STRERROR_R=0; - REPLACE_STRNCAT=0; - REPLACE_STRNDUP=0; - REPLACE_STRNLEN=0; REPLACE_STRSIGNAL=0; - REPLACE_STRTOK_R=0; UNDEFINE_STRTOK_R=0; + # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is # irrelevant for anonymous mappings. @@ -21270,10 +21852,10 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h if test $HAVE_MEMCHR = 1; then # Detect platform-specific bugs in some versions of glibc: # memchr should not dereference anything with length 0 - # http://bugzilla.redhat.com/499689 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 # memchr should not dereference overestimated length after a match - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 - # http://sourceware.org/bugzilla/show_bug.cgi?id=10162 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 + # https://sourceware.org/bugzilla/show_bug.cgi?id=10162 # Assume that memchr works on platforms that lack mprotect. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5 $as_echo_n "checking whether memchr works... " >&6; } @@ -21281,7 +21863,13 @@ if ${gl_cv_func_memchr_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_func_memchr_works="guessing no" + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # Be pessimistic for now. + *) gl_cv_func_memchr_works="guessing no" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21347,12 +21935,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 $as_echo "$gl_cv_func_memchr_works" >&6; } - if test "$gl_cv_func_memchr_works" != yes; then - REPLACE_MEMCHR=1 - fi + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac fi ac_fn_c_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_default" @@ -21447,26 +22037,6 @@ $as_echo "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h - GNULIB_MKTIME=0; - GNULIB_NANOSLEEP=0; - GNULIB_STRPTIME=0; - GNULIB_TIMEGM=0; - GNULIB_TIME_R=0; - GNULIB_TIME_RZ=0; - HAVE_DECL_LOCALTIME_R=1; - HAVE_NANOSLEEP=1; - HAVE_STRPTIME=1; - HAVE_TIMEGM=1; - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; - REPLACE_MKTIME=GNULIB_PORTCHECK; - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; - REPLACE_TIMEGM=GNULIB_PORTCHECK; - - : ${GNULIB_GETTIMEOFDAY=0}; - REPLACE_GMTIME=0; - REPLACE_LOCALTIME=0; - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5 $as_echo_n "checking whether time_t is signed... " >&6; } if ${gl_cv_time_t_is_signed+:} false; then : @@ -21516,6 +22086,249 @@ _ACEOF + + + + if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple Mac OS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + gl_cv_func_working_mktime=no + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +$as_echo_n "checking for working mktime... " >&6; } +if ${gl_cv_func_working_mktime+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_working_mktime="guessing no" ;; + *) gl_cv_func_working_mktime="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Test program from Paul Eggert and Tony Leneis. */ +#include +#include +#include + +#ifdef HAVE_UNISTD_H +# include +#endif + +#if HAVE_DECL_ALARM +# include +#endif + +#ifndef TIME_T_IS_SIGNED +# define TIME_T_IS_SIGNED 0 +#endif + +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv + +static time_t time_t_max; +static time_t time_t_min; + +/* Values we'll use to set the TZ environment variable. */ +static char *tz_strings[] = { + (char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static int +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + return mktime (&tm) != (time_t) -1; +} + +static int +mktime_test1 (time_t now) +{ + struct tm *lt; + return ! (lt = localtime (&now)) || mktime (lt) == now; +} + +static int +mktime_test (time_t now) +{ + return (mktime_test1 (now) + && mktime_test1 ((time_t) (time_t_max - now)) + && mktime_test1 ((time_t) (time_t_min + now))); +} + +static int +irix_6_4_bug () +{ + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + return tm.tm_mon == 2 && tm.tm_mday == 31; +} + +static int +bigtime_test (int j) +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + return 0; + } + return 1; +} + +static int +year_2050_test () +{ + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ + unsigned long int answer = 2527315200UL; + + struct tm tm; + time_t t; + tm.tm_year = 2050 - 1900; + tm.tm_mon = 2 - 1; + tm.tm_mday = 1; + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + tm.tm_isdst = -1; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + t = mktime (&tm); + + /* Check that the result is either a failure, or close enough + to the correct answer that we can assume the discrepancy is + due to leap seconds. */ + return (t == (time_t) -1 + || (0 < t && answer - 120 <= t && t <= answer + 120)); +} + +int +main () +{ + int result = 0; + time_t t, delta; + int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + +#if HAVE_DECL_ALARM + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + signal (SIGALRM, SIG_DFL); + alarm (60); +#endif + + time_t_max = (! TIME_T_IS_SIGNED + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! TIME_T_IS_SIGNED + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); + + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) + if (! mktime_test (t)) + result |= 1; + if ((result & 2) == 0 + && ! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) + result |= 2; + + for (j = 1; (result & 4) == 0; j <<= 1) + { + if (! bigtime_test (j)) + result |= 4; + if (INT_MAX / 2 < j) + break; + } + if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) + result |= 8; + } + if (! irix_6_4_bug ()) + result |= 16; + if (! spring_forward_gap ()) + result |= 32; + if (! year_2050_test ()) + result |= 64; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_working_mktime=yes +else + gl_cv_func_working_mktime=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 +$as_echo "$gl_cv_func_working_mktime" >&6; } + + + + + GNULIB_PSELECT=0; GNULIB_SELECT=0; HAVE_PSELECT=1; @@ -22026,10 +22839,10 @@ else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; esac else @@ -22112,6 +22925,37 @@ rm -f core conftest.err conftest.$ac_objext \ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 +$as_echo_n "checking for O_CLOEXEC... " >&6; } +if ${gl_cv_macro_O_CLOEXEC+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #ifndef O_CLOEXEC + choke me; + #endif + +int +main () +{ +return O_CLOEXEC; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_macro_O_CLOEXEC=yes +else + gl_cv_macro_O_CLOEXEC=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 +$as_echo "$gl_cv_macro_O_CLOEXEC" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5 $as_echo_n "checking for promoted mode_t type... " >&6; } @@ -22416,7 +23260,7 @@ if ac_fn_c_try_link "$LINENO"; then : if test -s conftest$ac_exeext \ && ./conftest$ac_exeext > conftest.out \ && echo 'This should be seen only once.' > conftest.ok \ - && cmp conftest.out conftest.ok > /dev/null; then + && cmp conftest.out conftest.ok >/dev/null 2>&1; then gl_cv_func_posix_spawn_works=yes else gl_cv_func_posix_spawn_works=no @@ -22746,84 +23590,6 @@ $as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; } - for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if ${ac_cv_func_malloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; - esac - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *malloc (); - #endif - -int -main () -{ -char *p = malloc (0); - int result = !p; - free (p); - return result; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - 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.beam conftest.$ac_ext -fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$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 - - - - - - - @@ -22837,27 +23603,6 @@ _ACEOF - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef _MSC_VER -MicrosoftCompiler -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "MicrosoftCompiler" >/dev/null 2>&1; then : - gl_asmext='asm' - gl_c_asm_opt='-c -Fa' - -else - gl_asmext='s' - gl_c_asm_opt='-S' - -fi -rm -f conftest* - @@ -22917,10 +23662,9 @@ if ${gl_cv_func_snprintf_retval_c99+:} false; then : else if test "$cross_compiling" = yes; then : - - case "$host_os" in + case "$host_os" in # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; @@ -22943,6 +23687,24 @@ else netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on MSVC, no on mingw. + mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _MSC_VER + Known +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Known" >/dev/null 2>&1; then : + gl_cv_func_snprintf_retval_c99="guessing yes" +else + gl_cv_func_snprintf_retval_c99="guessing no" +fi +rm -f conftest* + + ;; # If we don't know, assume the worst. *) gl_cv_func_snprintf_retval_c99="guessing no";; esac @@ -23035,10 +23797,12 @@ if ${gl_cv_func_strerror_0_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_strerror_0_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_strerror_0_works="guessing no" ;; esac else @@ -23092,10 +23856,8 @@ $as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" -if test "x$ac_cv_func_strerror_r" = xyes; then : -fi + if test $ac_cv_func_strerror_r = yes; then if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then @@ -23257,6 +24019,17 @@ $as_echo "$gl_cv_func_strerror_r_works" >&6; } fi fi +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_strerror_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R $ac_have_decl +_ACEOF + @@ -23910,14 +24683,27 @@ cat >>confdefs.h <<_ACEOF _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the utimes function works" >&5 + GNULIB_UTIME=0; + HAVE_UTIME=1; + REPLACE_UTIME=0; + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the utimes function works" >&5 $as_echo_n "checking whether the utimes function works... " >&6; } if ${gl_cv_func_working_utimes+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - gl_cv_func_working_utimes=no + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_working_utimes="guessing no" ;; + *) gl_cv_func_working_utimes="guessing no" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24048,58 +24834,18 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_utimes" >&5 $as_echo "$gl_cv_func_working_utimes" >&6; } - if test $gl_cv_func_working_utimes = yes; then + case "$gl_cv_func_working_utimes" in + *yes) $as_echo "#define HAVE_WORKING_UTIMES 1" >>confdefs.h - fi - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5 -$as_echo_n "checking for struct utimbuf... " >&6; } -if ${gl_cv_sys_struct_utimbuf+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if HAVE_SYS_TIME_H - #include - #endif - #include - #ifdef HAVE_UTIME_H - #include - #endif - -int -main () -{ -static struct utimbuf x; x.actime = x.modtime; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_sys_struct_utimbuf=yes -else - gl_cv_sys_struct_utimbuf=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_utimbuf" >&5 -$as_echo "$gl_cv_sys_struct_utimbuf" >&6; } - - if test $gl_cv_sys_struct_utimbuf = yes; then - -$as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h - - fi + ;; + esac @@ -24648,7 +25394,7 @@ fi gl_cond_libtool=false gl_libdeps= gl_ltlibdeps= - gl_m4_base='m4' + gl_m4_base='m4/' @@ -24658,7 +25404,7 @@ fi - gl_source_base='lib' + gl_source_base='lib/' if test "$ac_cv_header_winsock2_h" = yes; then @@ -24940,6 +25686,8 @@ else case "$host_os" in # Guess no on Cygwin. cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_nul="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_btowc_nul="guessing yes" ;; esac @@ -24985,10 +25733,12 @@ if ${gl_cv_func_btowc_eof+:} false; then : 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" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac if test $LOCALE_FR != none; then if test "$cross_compiling" = yes; then : @@ -25215,9 +25965,11 @@ $as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_CLOSE=1 - fi + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_CLOSE=1 + fi + @@ -26335,7 +27087,8 @@ else #include #include #include - struct s { int n; double d[]; }; + struct m { struct m *next, **list; char name[]; }; + struct s { struct s *p; struct m *m; int n; double d[]; }; int main () { @@ -26344,6 +27097,8 @@ int m = getchar (); nbytes += sizeof (struct s) - 1; nbytes -= nbytes % sizeof (struct s); struct s *p = malloc (nbytes); + p->p = p; + p->m = NULL; p->d[0] = 0.0; return p->d != (double *) NULL; ; @@ -26377,7 +27132,7 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h aix* | beos* | openbsd* | mirbsd* | irix*) FLOAT_H=float.h ;; - freebsd*) + freebsd* | dragonfly*) case "$host_cpu" in i[34567]86 ) FLOAT_H=float.h @@ -26388,17 +27143,18 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined __LP64__ || defined __x86_64__ || defined __amd64__ - yes - #endif + int ok; + #else + error fail + #endif + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : +if ac_fn_c_try_compile "$LINENO"; then : else FLOAT_H=float.h fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac ;; @@ -26411,7 +27167,7 @@ rm -f conftest* ;; esac case "$host_os" in - aix* | freebsd* | linux*) + aix* | freebsd* | dragonfly* | linux*) if test -n "$FLOAT_H"; then REPLACE_FLOAT_LDBL=1 fi @@ -26431,19 +27187,22 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined __LP64__ || defined __arch64__ - yes - #endif + int ok; + #else + error fail + #endif + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : +if ac_fn_c_try_compile "$LINENO"; then : gl_cv_func_itold_works="guessing no" else gl_cv_func_itold_works="guessing yes" fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; - *) gl_cv_func_itold_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_itold_works="guessing yes" ;; + *) gl_cv_func_itold_works="guessing yes" ;; esac else @@ -26840,7 +27599,11 @@ else #include int main () { - return fopen ("conftest.sl/", "w") != NULL; + FILE *fp = fopen ("conftest.sl/", "w"); + int result = (fp != NULL); + if (fp != NULL) + fclose (fp); + return result; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -27029,14 +27792,11 @@ $as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FSTAT=1 - fi - - - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - REPLACE_FSTAT=1 - fi + case "$host_os" in + mingw* | solaris*) + REPLACE_FSTAT=1 + ;; + esac @@ -27051,7 +27811,24 @@ $as_echo "#define GNULIB_TEST_FSEEKO 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS fstat.$ac_objext" - : + case "$host_os" in + mingw*) + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext" + + ;; + esac + + + : + fi @@ -27163,6 +27940,8 @@ else case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_ftello_works="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_ftello_works="guessing yes" ;; esac @@ -27186,7 +27965,7 @@ main (void) if (fp == NULL) return 70; if (fwrite ("foogarsh", 1, 8, fp) < 8) - return 71; + { fclose (fp); return 71; } if (fclose (fp)) return 72; @@ -27197,19 +27976,19 @@ main (void) if (fp == NULL) return 73; if (fseek (fp, -1, SEEK_END)) - return 74; + { fclose (fp); return 74; } if (!(getc (fp) == 'h')) - return 1; + { fclose (fp); return 1; } if (!(getc (fp) == EOF)) - return 2; + { fclose (fp); return 2; } if (!(ftell (fp) == 8)) - return 3; + { fclose (fp); return 3; } if (!(ftell (fp) == 8)) - return 4; + { fclose (fp); return 4; } if (!(putc ('!', fp) == '!')) - return 5; + { fclose (fp); return 5; } if (!(ftell (fp) == 9)) - return 6; + { fclose (fp); return 6; } if (!(fclose (fp) == 0)) return 7; fp = fopen (TESTFILE, "r"); @@ -27218,9 +27997,9 @@ main (void) { char buf[10]; if (!(fread (buf, 1, 10, fp) == 9)) - return 10; + { fclose (fp); return 10; } if (!(memcmp (buf, "foogarsh!", 9) == 0)) - return 11; + { fclose (fp); return 11; } } if (!(fclose (fp) == 0)) return 12; @@ -27321,10 +28100,14 @@ else int main () { -struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; +struct timespec ts[2]; int fd = creat ("conftest.file", 0600); struct stat st; if (fd < 0) return 1; + ts[0].tv_sec = 1; + ts[0].tv_nsec = UTIME_OMIT; + ts[1].tv_sec = 1; + ts[1].tv_nsec = UTIME_NOW; errno = 0; if (futimens (AT_FDCWD, NULL) == 0) return 2; if (errno != EBADF) return 3; @@ -27878,7 +28661,7 @@ else size_t siz = 0; int len = getdelim (&line, &siz, '\n', in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 2; + { free (line); fclose (in); return 2; } } { /* Test result for a NULL buffer and a non-zero size. @@ -27886,7 +28669,7 @@ else char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getdelim (&line, &siz, '\n', in) == -1) - return 3; + { fclose (in); return 3; } free (line); } fclose (in); @@ -27978,33 +28761,34 @@ $as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h if test $ac_cv_func_getdtablesize = yes && test $ac_cv_have_decl_getdtablesize = yes; then - # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit - # up to an unchangeable hard limit; all other platforms correctly - # require setrlimit before getdtablesize() can report a larger value. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 $as_echo_n "checking whether getdtablesize works... " >&6; } if ${gl_cv_func_getdtablesize_works+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + case "$host_os" in + vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; + *) + if test "$cross_compiling" = yes; then : case "$host_os" in - cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows - gl_cv_func_getdtablesize_works="guessing no" ;; - *) gl_cv_func_getdtablesize_works="guessing yes" ;; - esac + cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows + gl_cv_func_getdtablesize_works="guessing no" ;; + *) gl_cv_func_getdtablesize_works="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { int size = getdtablesize(); - if (dup2 (0, getdtablesize()) != -1) - return 1; - if (size != getdtablesize()) - return 2; + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; ; return 0; @@ -28019,12 +28803,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + ;; + esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 $as_echo "$gl_cv_func_getdtablesize_works" >&6; } case "$gl_cv_func_getdtablesize_works" in - *yes) ;; + *yes | "no (limitation)") ;; *) REPLACE_GETDTABLESIZE=1 ;; esac else @@ -28126,10 +28912,10 @@ if ${ac_cv_func_getgroups_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_getgroups_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; esac else @@ -28192,10 +28978,10 @@ if ${gl_cv_func_getgroups_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_getgroups_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_getgroups_works="guessing no" ;; esac else @@ -28323,7 +29109,7 @@ else size_t siz = 0; int len = getline (&line, &siz, in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 2; + { free (line); fclose (in); return 2; } free (line); } { @@ -28332,7 +29118,7 @@ else char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getline (&line, &siz, in) == -1) - return 3; + { fclose (in); return 3; } free (line); } fclose (in); @@ -28399,34 +29185,6 @@ $as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h - if test $REPLACE_GETOPT = 1; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" - - - - - GNULIB_GL_UNISTD_H_GETOPT=1 - fi - - @@ -28438,10 +29196,20 @@ $as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h if test $REPLACE_GETOPT = 1; then - GETOPT_H=getopt.h + + if test $ac_cv_header_sys_cdefs_h = yes; then + HAVE_SYS_CDEFS_H=1 + else + HAVE_SYS_CDEFS_H=0 + fi + + $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h + fi @@ -28467,9 +29235,6 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" - - - GNULIB_GL_UNISTD_H_GETOPT=1 fi @@ -28683,6 +29448,7 @@ $as_echo "#define GNULIB_TEST_GETSOCKNAME 1" >>confdefs.h + gl_gettimeofday_timezone=void if test $ac_cv_func_gettimeofday != yes; then HAVE_GETTIMEOFDAY=0 @@ -28690,6 +29456,7 @@ $as_echo "#define GNULIB_TEST_GETSOCKNAME 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5 $as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; } if ${gl_cv_func_gettimeofday_clobber+:} false; then : @@ -28698,10 +29465,12 @@ else if test "$cross_compiling" = yes; then : # When cross-compiling: case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; + # Guess all is fine on glibc systems. + *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; esac else @@ -28746,11 +29515,14 @@ $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; } *yes) REPLACE_GETTIMEOFDAY=1 - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 +$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h -$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h + + + NEED_LOCALTIME_BUFFER=1 + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 ;; esac @@ -28818,7 +29590,9 @@ $as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; } if test $REPLACE_STRUCT_TIMEVAL = 1; then REPLACE_GETTIMEOFDAY=1 fi - + case "$host_os" in + mingw*) REPLACE_GETTIMEOFDAY=1 ;; + esac fi cat >>confdefs.h <<_ACEOF @@ -28837,31 +29611,7 @@ _ACEOF gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" - - for ac_header in sys/timeb.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_timeb_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIMEB_H 1 -_ACEOF - -fi - -done - - for ac_func in _ftime -do : - ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime" -if test "x$ac_cv_func__ftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE__FTIME 1 -_ACEOF - -fi -done - - + : fi @@ -28935,6 +29685,7 @@ $as_echo "#define GNULIB_TEST_GROUP_MEMBER 1" >>confdefs.h : + HOSTENT_LIB= gl_saved_libs="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 @@ -29151,7 +29902,7 @@ $as_echo "$gl_cv_next_iconv_h" >&6; } - HAVE_INET_NTOP=1 + HAVE_INET_NTOP=1 INET_NTOP_LIB= @@ -29226,7 +29977,7 @@ return inet_ntop (); return 0; } _ACEOF -for ac_lib in '' nsl resolv; do +for ac_lib in '' nsl resolv network; do if test -z "$ac_lib"; then ac_res="none required" else @@ -29648,6 +30399,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + /* On some platforms, ioctl() is declared in . */ + #include + int main () { @@ -30070,10 +30824,10 @@ else fi if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_link_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_link_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_link_works="guessing no" ;; esac else @@ -30473,6 +31227,17 @@ $as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext" + + + if test "$gl_threads_api" = posix; then # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. @@ -30794,10 +31559,11 @@ $as_echo "#define GNULIB_TEST_LSEEK 1" >>confdefs.h + if test $ac_cv_func_lstat = yes; then - case "$gl_cv_func_lstat_dereferences_slashed_symlink" in - *no) + case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in + solaris* | *no) REPLACE_LSTAT=1 ;; esac @@ -30878,6 +31644,10 @@ $as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h + + + + : @@ -31417,10 +32187,11 @@ if ${gl_cv_func_mbrtowc_empty_input+:} false; then : else case "$host_os" in - # Guess no on AIX and glibc systems. - aix* | *-gnu*) - gl_cv_func_mbrtowc_empty_input="guessing no" ;; - *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + # Guess no on AIX and glibc systems. + aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; esac if test "$cross_compiling" = yes; then : : @@ -31452,7 +32223,7 @@ fi $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 $as_echo_n "checking whether the C locale is free of encoding errors... " >&6; } if ${gl_cv_C_locale_sans_EILSEQ+:} false; then : $as_echo_n "(cached) " >&6 @@ -31461,7 +32232,11 @@ else gl_cv_C_locale_sans_EILSEQ="guessing no" if test "$cross_compiling" = yes; then : - : + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31501,6 +32276,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5 $as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; } @@ -32296,10 +33072,28 @@ else rm -rf conftest.dir if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _MSC_VER + Known +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Known" >/dev/null 2>&1; then : + gl_cv_func_mkdir_trailing_slash_works="guessing yes" +else + gl_cv_func_mkdir_trailing_slash_works="guessing no" +fi +rm -f conftest* + + ;; + # If we don't know, assume the worst. + *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; esac else @@ -32347,10 +33141,12 @@ else rm -rf conftest.dir if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; esac else @@ -32465,10 +33261,12 @@ else mkdir conftest.mkstemp if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_mkstemp="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_working_mkstemp="guessing no" ;; esac else @@ -32567,241 +33365,21 @@ $as_echo "#define GNULIB_TEST_MKSTEMP 1" >>confdefs.h + REPLACE_MKTIME=0 + if test "$gl_cv_func_working_mktime" != yes; then + REPLACE_MKTIME=1 +$as_echo "#define NEED_MKTIME_WORKING 1" >>confdefs.h - - if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple Mac OS X platforms. - # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. - # But we need a configuration result that is valid in both modes. - gl_cv_func_working_mktime=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if ${gl_cv_func_working_mktime+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - gl_cv_func_working_mktime=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#include -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#if HAVE_DECL_ALARM -# include -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static char *tz_strings[] = { - (char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} - -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} - -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} - -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} - -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} - -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; - - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); - - t = mktime (&tm); - - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} - -int -main () -{ - int result = 0; - time_t t, delta; - int i, j; - int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; - -#if HAVE_DECL_ALARM - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - signal (SIGALRM, SIG_DFL); - alarm (60); -#endif - - time_t_max = (! TIME_T_IS_SIGNED - ? (time_t) -1 - : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) - * 2 + 1)); - time_t_min = (! TIME_T_IS_SIGNED - ? (time_t) 0 - : time_t_signed_magnitude - ? ~ (time_t) 0 - : ~ time_t_max); - - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) - if (! mktime_test (t)) - result |= 1; - if ((result & 2) == 0 - && ! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - result |= 2; - - for (j = 1; (result & 4) == 0; j <<= 1) - { - if (! bigtime_test (j)) - result |= 4; - if (INT_MAX / 2 < j) - break; - } - if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) - result |= 8; - } - if (! irix_6_4_bug ()) - result |= 16; - if (! spring_forward_gap ()) - result |= 32; - if (! year_2050_test ()) - result |= 64; - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_working_mktime=yes -else - gl_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - + case "$host_os" in + mingw*) + REPLACE_MKTIME=1 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 -$as_echo "$gl_cv_func_working_mktime" >&6; } +$as_echo "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h - if test $gl_cv_func_working_mktime = no; then - REPLACE_MKTIME=1 - else - REPLACE_MKTIME=0 - fi + ;; + esac if test $REPLACE_MKTIME = 1; then @@ -32833,21 +33411,24 @@ $as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h - if test $REPLACE_MKTIME = 0; then - ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal" + + WANT_MKTIME_INTERNAL=0 + ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal" if test "x$ac_cv_func___mktime_internal" = xyes; then : $as_echo "#define mktime_internal __mktime_internal" >>confdefs.h else - REPLACE_MKTIME=1 + WANT_MKTIME_INTERNAL=1 + +$as_echo "#define NEED_MKTIME_INTERNAL 1" >>confdefs.h + fi - fi - if test $REPLACE_MKTIME = 1; then + if test $WANT_MKTIME_INTERNAL = 1; then @@ -32888,6 +33469,13 @@ fi fi +cat >>confdefs.h <<_ACEOF +#define GNULIB_MSVC_NOTHROW 1 +_ACEOF + + + + @@ -32978,6 +33566,8 @@ else if test "$cross_compiling" = yes; then : case "$host_os" in linux*) # Guess it halfway works when the kernel is Linux. gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; + mingw*) # Guess no on native Windows. + gl_cv_func_nanosleep='guessing no' ;; *) # If we don't know, assume the worst. gl_cv_func_nanosleep='guessing no' ;; esac @@ -33476,12 +34066,16 @@ $as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h + case "$host_os" in mingw* | pw*) REPLACE_OPEN=1 ;; *) + if test "$gl_cv_macro_O_CLOEXEC" != yes; then + REPLACE_OPEN=1 + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5 $as_echo_n "checking whether open recognizes a trailing slash... " >&6; } if ${gl_cv_func_open_slash+:} false; then : @@ -33732,8 +34326,10 @@ else if test "$cross_compiling" = yes; then : # Guess no on Solaris, yes otherwise. case "$host_os" in - solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";; - *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";; + solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;; esac else @@ -33815,6 +34411,8 @@ else # Guess no on Solaris, yes otherwise. case "$host_os" in solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";; esac @@ -33897,6 +34495,8 @@ else # Guess no on Solaris, yes otherwise. case "$host_os" in solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";; esac @@ -34218,7 +34818,6 @@ $as_echo "#define GNULIB_TEST_POSIX_SPAWNP 1" >>confdefs.h - for ac_func in raise do : ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise" @@ -34233,9 +34832,12 @@ done if test $ac_cv_func_raise = no; then HAVE_RAISE=0 else - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_RAISE=1 - fi + + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_RAISE=1 + fi + @@ -34391,7 +34993,13 @@ if ${gl_cv_func_re_compile_pattern_working+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_func_re_compile_pattern_working=no + case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise, assume it is not working. + *) gl_cv_func_re_compile_pattern_working="guessing no" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34440,7 +35048,7 @@ int result = 0; if (setlocale (LC_ALL, "en_US.UTF-8")) { { - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + /* https://sourceware.org/ml/libc-hacker/2006-09/msg00008.html This test needs valgrind to catch the bug on Debian GNU/Linux 3.1 x86, but it might catch the bug better on other platforms and it shouldn't hurt to try the @@ -34464,7 +35072,7 @@ int result = 0; { /* This test is from glibc bug 15078. The test case is from Andreas Schwab in - . + . */ static char const pat[] = "[^x]x"; static char const data[] = @@ -34562,7 +35170,7 @@ int result = 0; result |= 16; /* Catch a bug reported by Vin Shelton in - http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html + https://lists.gnu.org/r/bug-coreutils/2007-06/msg00089.html */ re_set_syntax (RE_SYNTAX_POSIX_BASIC & ~RE_CONTEXT_INVALID_DUP @@ -34604,12 +35212,13 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5 $as_echo "$gl_cv_func_re_compile_pattern_working" >&6; } - case $gl_cv_func_re_compile_pattern_working in #( - yes) ac_use_included_regex=no;; #( - no) ac_use_included_regex=yes;; + case "$gl_cv_func_re_compile_pattern_working" in #( + *yes) ac_use_included_regex=no;; #( + *no) ac_use_included_regex=yes;; esac ;; *) as_fn_error $? "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5 @@ -34717,6 +35326,7 @@ _ACEOF fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34846,14 +35456,25 @@ else fi else - ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include + HAVE_STRUCT_SCHED_PARAM=0 + case "$host_os" in + os2*) + ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include +" +if test "x$ac_cv_type_struct_sched_param" = xyes; then : + HAVE_STRUCT_SCHED_PARAM=1 +fi + + ;; + vms) + ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include " if test "x$ac_cv_type_struct_sched_param" = xyes; then : HAVE_STRUCT_SCHED_PARAM=1 -else - HAVE_STRUCT_SCHED_PARAM=0 fi + ;; + esac fi @@ -35008,10 +35629,10 @@ else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; esac else @@ -35687,7 +36308,12 @@ if ${gl_cv_func_snprintf_size1+:} false; then : else if test "$cross_compiling" = yes; then : - gl_cv_func_snprintf_size1="guessing yes" + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -35747,6 +36373,7 @@ else netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) gl_cv_func_printf_positions="guessing no";; beos*) gl_cv_func_printf_positions="guessing no";; + # Guess no on native Windows. mingw* | pw*) gl_cv_func_printf_positions="guessing no";; *) gl_cv_func_printf_positions="guessing yes";; esac @@ -36153,58 +36780,29 @@ $as_echo "#define ssize_t int" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5 -$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; } -if ${gl_cv_func_stat_dir_slash+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - case $host_os in - mingw*) gl_cv_func_stat_dir_slash="guessing no";; - *) gl_cv_func_stat_dir_slash="guessing yes";; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main () -{ -struct stat st; return stat (".", &st) != stat ("./", &st); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_stat_dir_slash=yes -else - gl_cv_func_stat_dir_slash=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_dir_slash" >&5 -$as_echo "$gl_cv_func_stat_dir_slash" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 + case "$host_os" in + mingw*) + REPLACE_STAT=1 + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; } if ${gl_cv_func_stat_file_slash+:} false; then : $as_echo_n "(cached) " >&6 else touch conftest.tmp - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - ln -s conftest.tmp conftest.lnk - fi - if test "$cross_compiling" = yes; then : + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + ln -s conftest.tmp conftest.lnk + fi + if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; - esac + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_stat_file_slash="guessing no" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -36215,14 +36813,14 @@ int main () { int result = 0; - struct stat st; - if (!stat ("conftest.tmp/", &st)) - result |= 1; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) - result |= 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif - return result; + return result; ; return 0; @@ -36237,21 +36835,22 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - rm -f conftest.tmp conftest.lnk + rm -f conftest.tmp conftest.lnk fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 $as_echo "$gl_cv_func_stat_file_slash" >&6; } - case $gl_cv_func_stat_dir_slash in - *no) REPLACE_STAT=1 - -$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h -;; - esac - case $gl_cv_func_stat_file_slash in - *no) REPLACE_STAT=1 + case $gl_cv_func_stat_file_slash in + *no) + REPLACE_STAT=1 $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; + esac + case $host_os in + solaris*) + REPLACE_FSTAT=1 ;; + esac + ;; esac if test $REPLACE_STAT = 1; then @@ -36265,7 +36864,24 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - : + case "$host_os" in + mingw*) + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext" + + ;; + esac + + + : + fi @@ -36433,7 +37049,7 @@ else /* Test that alignof yields a result consistent with offsetof. This catches GCC bug 52023 - . */ + . */ #ifdef __cplusplus template struct alignof_helper { char a; t b; }; # define ao(type) offsetof (alignof_helper, b) @@ -36450,8 +37066,8 @@ else || (defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ - || __ICC || 0x5110 <= __SUNPRO_C \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 @@ -36939,7 +37555,7 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; } - for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do + for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -37233,10 +37849,10 @@ if ${gl_cv_func_working_strerror+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_working_strerror="guessing no" ;; esac else @@ -37361,18 +37977,10 @@ done - ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" -if test "x$ac_cv_have_decl_strerror_r" = xyes; then : - HAVE_DECL_STRERROR_R=1 -else - HAVE_DECL_STRERROR_R=0 -fi - - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR_R_ORIG $HAVE_DECL_STRERROR_R -_ACEOF + if test $ac_cv_have_decl_strerror_r = no; then + HAVE_DECL_STRERROR_R=0 + fi if test $ac_cv_func_strerror_r = yes; then if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then @@ -37388,9 +37996,6 @@ _ACEOF fi fi - # Overwrite the findings of AC_FUNC_STRERROR_R (for code that uses that). - - if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then @@ -37425,6 +38030,13 @@ $as_echo "#define GNULIB_TEST_STRERROR_R 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GNULIB_STRERROR_R_POSIX 1 +_ACEOF + + + + @@ -37732,11 +38344,12 @@ if ${gl_cv_func_strtok_r_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - - case "$host_os" in - # Guess no on glibc systems. - *-gnu*) gl_cv_func_strtok_r_works="guessing no";; - *) gl_cv_func_strtok_r_works="guessing yes";; + case "$host_os" in + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strtok_r_works="guessing yes" ;; + *) gl_cv_func_strtok_r_works="guessing yes" ;; esac else @@ -37885,10 +38498,10 @@ if ${gl_cv_func_symlink_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_symlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_symlink_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_symlink_works="guessing no" ;; esac else @@ -38094,249 +38707,40 @@ fi - - if test $ac_cv_header_sys_ioctl_h = yes; then - HAVE_SYS_IOCTL_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declares ioctl" >&5 -$as_echo_n "checking whether declares ioctl... " >&6; } -if ${gl_cv_decl_ioctl_in_sys_ioctl_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main () -{ -(void) ioctl; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_decl_ioctl_in_sys_ioctl_h=yes -else - gl_cv_decl_ioctl_in_sys_ioctl_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_ioctl_in_sys_ioctl_h" >&5 -$as_echo "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; } - else - HAVE_SYS_IOCTL_H=0 - fi - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if ${gl_cv_next_sys_ioctl_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test $ac_cv_header_sys_ioctl_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'sys/ioctl.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - - gl_cv_absolute_sys_ioctl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_sys_ioctl_h - gl_cv_next_sys_ioctl_h='"'$gl_header'"' - else - gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>' - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_ioctl_h" >&5 -$as_echo "$gl_cv_next_sys_ioctl_h" >&6; } - fi - NEXT_SYS_IOCTL_H=$gl_cv_next_sys_ioctl_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'sys/ioctl.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_ioctl_h - fi - NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H=$gl_next_as_first_directive - - - - - - - for gl_func in ioctl; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 -$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -if eval \${$as_gl_Symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -/* Some platforms declare ioctl in the wrong header. */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -#endif - -int -main () -{ -#undef $gl_func - (void) $gl_func; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_gl_Symbol=yes" -else - eval "$as_gl_Symbol=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$as_gl_Symbol - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 -_ACEOF - - eval ac_cv_have_decl_$gl_func=yes -fi - done - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 -$as_echo_n "checking whether is self-contained... " >&6; } -if ${gl_cv_header_sys_select_h_selfcontained+:} false; then : + + if test $ac_cv_header_sys_ioctl_h = yes; then + HAVE_SYS_IOCTL_H=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declares ioctl" >&5 +$as_echo_n "checking whether declares ioctl... " >&6; } +if ${gl_cv_decl_ioctl_in_sys_ioctl_h+:} false; then : $as_echo_n "(cached) " >&6 else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include + int main () { -struct timeval b; +(void) ioctl; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_sys_select_h_selfcontained=yes + gl_cv_decl_ioctl_in_sys_ioctl_h=yes else - gl_cv_header_sys_select_h_selfcontained=no + gl_cv_decl_ioctl_in_sys_ioctl_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $gl_cv_header_sys_select_h_selfcontained = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int memset; int bzero; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ - #undef memset - #define memset nonexistent_memset - extern - #ifdef __cplusplus - "C" - #endif - void *memset (void *, int, unsigned long); - #undef bzero - #define bzero nonexistent_bzero - extern - #ifdef __cplusplus - "C" - #endif - void bzero (void *, unsigned long); - fd_set fds; - FD_ZERO (&fds); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - gl_cv_header_sys_select_h_selfcontained=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_ioctl_in_sys_ioctl_h" >&5 +$as_echo "$gl_cv_decl_ioctl_in_sys_ioctl_h" >&6; } + else + HAVE_SYS_IOCTL_H=0 + fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_select_h_selfcontained" >&5 -$as_echo "$gl_cv_header_sys_select_h_selfcontained" >&6; } @@ -38347,22 +38751,22 @@ $as_echo "$gl_cv_header_sys_select_h_selfcontained" >&6; } if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_select_h='<'sys/select.h'>' + gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>' else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if ${gl_cv_next_sys_select_h+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_ioctl_h+:} false; then : $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_sys_select_h = yes; then + if test $ac_cv_header_sys_ioctl_h = yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include _ACEOF case "$host_os" in aix*) gl_absname_cpp="$ac_cpp -C" ;; @@ -38378,7 +38782,7 @@ _ACEOF ;; esac gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'sys/select.h' \ + gl_header_literal_regex=`echo 'sys/ioctl.h' \ | sed -e "$gl_make_literal_regex_sed"` gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ @@ -38387,70 +38791,37 @@ _ACEOF q }' - gl_cv_absolute_sys_select_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + gl_cv_absolute_sys_ioctl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_sys_select_h - gl_cv_next_sys_select_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_sys_ioctl_h + gl_cv_next_sys_ioctl_h='"'$gl_header'"' else - gl_cv_next_sys_select_h='<'sys/select.h'>' + gl_cv_next_sys_ioctl_h='<'sys/ioctl.h'>' fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_select_h" >&5 -$as_echo "$gl_cv_next_sys_select_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_ioctl_h" >&5 +$as_echo "$gl_cv_next_sys_ioctl_h" >&6; } fi - NEXT_SYS_SELECT_H=$gl_cv_next_sys_select_h + NEXT_SYS_IOCTL_H=$gl_cv_next_sys_ioctl_h if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'sys/select.h'>' + gl_next_as_first_directive='<'sys/ioctl.h'>' else # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_select_h + gl_next_as_first_directive=$gl_cv_next_sys_ioctl_h fi - NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_sys_select_h = yes; then - HAVE_SYS_SELECT_H=1 - else - HAVE_SYS_SELECT_H=0 - fi - - - - - - if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK2_H 1 -_ACEOF - -fi + NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H=$gl_next_as_first_directive -done - fi - if test "$ac_cv_header_winsock2_h" = yes; then - HAVE_WINSOCK2_H=1 - UNISTD_H_HAVE_WINSOCK2_H=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H=1 - else - HAVE_WINSOCK2_H=0 - fi - for gl_func in pselect select; do + for gl_func in ioctl; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -38459,13 +38830,11 @@ if eval \${$as_gl_Symbol+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Some systems require prerequisite headers. */ -#include -#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H -# include +#include +/* Some platforms declare ioctl in the wrong header. */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include #endif -#include int main () @@ -38512,6 +38881,8 @@ fi + + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' @@ -38586,14 +38957,14 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; } + WINDOWS_STAT_TIMESPEC=0 + + - if test $WINDOWS_64_BIT_ST_SIZE = 1; then -$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h - fi ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include #include @@ -38984,7 +39355,7 @@ $as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h REPLACE_TIMEGM=0 if test $ac_cv_func_timegm = yes; then - if test $gl_cv_func_working_mktime = no; then + if test "$gl_cv_func_working_mktime" != yes; then # Assume that timegm is buggy if mktime is. REPLACE_TIMEGM=1 fi @@ -39122,7 +39493,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39151,7 +39522,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39207,7 +39578,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39237,7 +39608,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39298,7 +39669,7 @@ $as_echo "#define GNULIB_TEST_UNINORM_U8_NORMALIZE 1" >>confdefs.h || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39409,7 +39780,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } - for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do + for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat truncate ttyname_r unlink unlinkat usleep; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -39686,7 +40057,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8 } } } @@ -39723,6 +40094,8 @@ else case "$host_os" in # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; # If we don't know, assume the worst. *) gl_cv_func_unlink_honors_slashes="guessing no" ;; esac @@ -39909,6 +40282,197 @@ $as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h + + + if test $ac_cv_func_utime = no; then + HAVE_UTIME=0 + else + case "$host_os" in + mingw*) + REPLACE_UTIME=1 + ;; + esac + fi + + if test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS utime.$ac_objext" + + : + fi + + + + + + GNULIB_UTIME=1 + + + + + +$as_echo "#define GNULIB_TEST_UTIME 1" >>confdefs.h + + + + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_utime_h='<'utime.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_utime_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_utime_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'utime.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_utime_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_utime_h + gl_cv_next_utime_h='"'$gl_header'"' + else + gl_cv_next_utime_h='<'utime.h'>' + fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_utime_h" >&5 +$as_echo "$gl_cv_next_utime_h" >&6; } + fi + NEXT_UTIME_H=$gl_cv_next_utime_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'utime.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_utime_h + fi + NEXT_AS_FIRST_DIRECTIVE_UTIME_H=$gl_next_as_first_directive + + + + + + if test $ac_cv_header_utime_h = yes; then + HAVE_UTIME_H=1 + else + HAVE_UTIME_H=0 + fi + + + UTIME_H='' + if test $ac_cv_header_utime_h != yes; then + UTIME_H=utime.h + else + case "$host_os" in + mingw*) UTIME_H=utime.h + ;; + esac + fi + + if test -n "$UTIME_H"; then + GL_GENERATE_UTIME_H_TRUE= + GL_GENERATE_UTIME_H_FALSE='#' +else + GL_GENERATE_UTIME_H_TRUE='#' + GL_GENERATE_UTIME_H_FALSE= +fi + + + + for gl_func in utime; do + as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 +$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +if eval \${$as_gl_Symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +#undef $gl_func + (void) $gl_func; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_gl_Symbol=yes" +else + eval "$as_gl_Symbol=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_gl_Symbol + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +_ACEOF + + eval ac_cv_have_decl_$gl_func=yes +fi + done + + + @@ -40147,7 +40711,12 @@ if ${gl_cv_func_snprintf_size1+:} false; then : else if test "$cross_compiling" = yes; then : - gl_cv_func_snprintf_size1="guessing yes" + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40207,6 +40776,7 @@ else netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) gl_cv_func_printf_positions="guessing no";; beos*) gl_cv_func_printf_positions="guessing no";; + # Guess no on native Windows. mingw* | pw*) gl_cv_func_printf_positions="guessing no";; *) gl_cv_func_printf_positions="guessing yes";; esac @@ -40442,7 +41012,9 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } - for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do + + + for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -40692,6 +41264,8 @@ else case "$host_os" in # Guess no on AIX 4, OSF/1 and Solaris. aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac @@ -40818,6 +41392,8 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h + + if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else @@ -40896,7 +41472,7 @@ if ${gl_cv_func_iswcntrl_works+:} false; then : else if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #if __GNU_LIBRARY__ == 1 @@ -41188,7 +41764,35 @@ _ACEOF HAVE_DECL_WCWIDTH=0 fi - if test $ac_cv_func_wcwidth = yes; then + if test $ac_cv_func_wcwidth != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth is a macro" >&5 +$as_echo_n "checking whether wcwidth is a macro... " >&6; } +if ${gl_cv_func_wcwidth_macro+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef wcwidth + wchar_header_defines_wcwidth +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "wchar_header_defines_wcwidth" >/dev/null 2>&1; then : + gl_cv_func_wcwidth_macro=yes +else + gl_cv_func_wcwidth_macro=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_macro" >&5 +$as_echo "$gl_cv_func_wcwidth_macro" >&6; } + fi + + if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then HAVE_WCWIDTH=1 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5 $as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; } @@ -41199,9 +41803,9 @@ else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc and AIX 7 systems. - *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; - *) gl_cv_func_wcwidth_works="guessing no";; + # Guess yes on glibc and AIX 7 systems. + *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; + *) gl_cv_func_wcwidth_works="guessing no";; esac else @@ -41294,9 +41898,11 @@ $as_echo "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_WRITE=1 - fi + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_WRITE=1 + fi + @@ -41400,10 +42006,13 @@ done + LIBGNU_LIBDEPS="$gl_libdeps" LIBGNU_LTLIBDEPS="$gl_ltlibdeps" + LIBTESTS_LIBDEPS="$gltests_libdeps" + @@ -41564,8 +42173,6 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); - free (data); - free (data3); return 0; } _ACEOF @@ -41854,8 +42461,8 @@ if test "x$with_libpsl" != xno; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 -$as_echo_n "checking for LIBPSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpsl" >&5 +$as_echo_n "checking for libpsl... " >&6; } if test -n "$LIBPSL_CFLAGS"; then pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS" @@ -41895,7 +42502,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -41975,7 +42582,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing psl_builtin" >&5 @@ -42082,8 +42689,8 @@ if test x"$with_zlib" != xno; then : with_zlib=yes pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 -$as_echo_n "checking for ZLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5 +$as_echo_n "checking for zlib... " >&6; } if test -n "$ZLIB_CFLAGS"; then pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" @@ -42123,7 +42730,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -42187,7 +42794,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 @@ -42257,8 +42864,8 @@ if test x"$with_ssl" = xopenssl; then : if test x"$with_libssl_prefix" = x; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5 -$as_echo_n "checking for OPENSSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +$as_echo_n "checking for openssl... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" @@ -42298,7 +42905,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -42325,7 +42932,7 @@ Alternatively, you may set the environment variables OPENSSL_CFLAGS and OPENSSL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -43184,8 +43791,8 @@ else if test x"$with_libgnutls_prefix" = x; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 -$as_echo_n "checking for GNUTLS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls" >&5 +$as_echo_n "checking for gnutls... " >&6; } if test -n "$GNUTLS_CFLAGS"; then pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" @@ -43225,7 +43832,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -43252,7 +43859,7 @@ Alternatively, you may set the environment variables GNUTLS_CFLAGS and GNUTLS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -44048,8 +44655,8 @@ if test x"$with_metalink" != xno; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for METALINK" >&5 -$as_echo_n "checking for METALINK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmetalink" >&5 +$as_echo_n "checking for libmetalink... " >&6; } if test -n "$METALINK_CFLAGS"; then pkg_cv_METALINK_CFLAGS="$METALINK_CFLAGS" @@ -44089,7 +44696,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -44109,7 +44716,7 @@ fi with_metalink=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } with_metalink=no @@ -44726,8 +45333,8 @@ if test "x$with_libuuid" = xyes; then : # libuuid was explicitly requested pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5 -$as_echo_n "checking for UUID... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid" >&5 +$as_echo_n "checking for uuid... " >&6; } if test -n "$UUID_CFLAGS"; then pkg_cv_UUID_CFLAGS="$UUID_CFLAGS" @@ -44767,7 +45374,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -44844,7 +45451,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5 @@ -45039,8 +45646,8 @@ if test "X$enable_pcre" != "Xno"; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE" >&5 -$as_echo_n "checking for PCRE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre" >&5 +$as_echo_n "checking for libpcre... " >&6; } if test -n "$PCRE_CFLAGS"; then pkg_cv_PCRE_CFLAGS="$PCRE_CFLAGS" @@ -45080,7 +45687,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -45151,7 +45758,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" @@ -45235,8 +45842,8 @@ if test "X$with_cares" = "Xyes"; then : pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5 -$as_echo_n "checking for CARES... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcares" >&5 +$as_echo_n "checking for libcares... " >&6; } if test -n "$CARES_CFLAGS"; then pkg_cv_CARES_CFLAGS="$CARES_CFLAGS" @@ -45276,7 +45883,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -45348,7 +45955,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ac_fn_c_check_header_mongrel "$LINENO" "ares.h" "ac_cv_header_ares_h" "$ac_includes_default" @@ -45759,6 +46366,10 @@ fi if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_UTIME_H_TRUE}" && test -z "${GL_GENERATE_UTIME_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_UTIME_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -46206,7 +46817,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wget $as_me 1.19.2, which was +This file was extended by wget $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46276,7 +46887,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wget config.status 1.19.2 +wget config.status 1.19.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 13debe2..d9f0098 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Template file for GNU Autoconf -dnl Copyright (C) 1995, 1996, 1997, 2001, 2007, 2008, 2009, 2010, 2011, 2012, -dnl 2013, 2014 Free Software Foundation, Inc. +dnl Copyright (C) 1995-1997, 2001, 2007-2014, 2018 Free Software +dnl Foundation, Inc. dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.am b/doc/Makefile.am index 0a03319..aab89ab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.in b/doc/Makefile.in index 60dca9e..c8e47eb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -15,8 +15,8 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -139,7 +139,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -155,28 +156,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -214,17 +216,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \ @@ -371,6 +374,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -387,6 +391,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -394,6 +399,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -466,6 +472,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -511,6 +518,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -559,6 +567,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -595,6 +604,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -618,7 +628,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -626,6 +638,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -649,6 +662,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -689,6 +703,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -711,12 +726,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -737,6 +754,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -830,6 +848,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -884,13 +903,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -907,6 +930,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -937,6 +961,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -971,6 +997,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1042,6 +1069,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1075,6 +1103,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1113,10 +1142,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1225,6 +1256,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1241,11 +1273,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1254,6 +1289,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1284,6 +1320,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1291,6 +1328,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1301,7 +1340,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/doc/fdl.texi b/doc/fdl.texi index a661cb8..16a8d1f 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -5,7 +5,7 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2015 Free Software +Copyright @copyright{} 2000-2002, 2007-2008, 2015, 2018 Free Software Foundation, Inc. @uref{http://fsf.org/} diff --git a/doc/stamp-vti b/doc/stamp-vti index 3f08c19..6037911 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 26 October 2017 -@set UPDATED-MONTH October 2017 -@set EDITION 1.19.2 -@set VERSION 1.19.2 +@set UPDATED 14 January 2018 +@set UPDATED-MONTH January 2018 +@set EDITION 1.19.3 +@set VERSION 1.19.3 diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl index f0ab983..6dacf68 100755 --- a/doc/texi2pod.pl +++ b/doc/texi2pod.pl @@ -1,7 +1,7 @@ #! /usr/bin/env perl -# Copyright (C) 1999, 2000, 2001, 2003, 2007, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003, 2007, 2009-2011, 2015, 2018 Free +# Software Foundation, Inc. # This file is part of GCC. diff --git a/doc/version.texi b/doc/version.texi index 3f08c19..6037911 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 26 October 2017 -@set UPDATED-MONTH October 2017 -@set EDITION 1.19.2 -@set VERSION 1.19.2 +@set UPDATED 14 January 2018 +@set UPDATED-MONTH January 2018 +@set EDITION 1.19.3 +@set VERSION 1.19.3 diff --git a/doc/wget.info b/doc/wget.info index 985b614..aa6e8ef 100644 --- a/doc/wget.info +++ b/doc/wget.info @@ -2,9 +2,7 @@ This is wget.info, produced by makeinfo version 6.5 from wget.texi. This file documents the GNU Wget utility for downloading network data. - Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, -Inc. + Copyright © 1996-2011, 2015, 2018 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -20,14 +18,12 @@ END-INFO-DIR-ENTRY  File: wget.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir) -Wget 1.19.2 +Wget 1.19.3 *********** This file documents the GNU Wget utility for downloading network data. - Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, -Inc. + Copyright © 1996-2011, 2015, 2018 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -3783,8 +3779,8 @@ File: wget.info, Node: Distribution, Next: Web Site, Prev: Proxies, Up: Vari Like all GNU utilities, the latest version of Wget can be found at the master GNU archive site ftp.gnu.org, and its mirrors. For example, Wget -1.19.2 can be found at - +1.19.3 can be found at +  File: wget.info, Node: Web Site, Next: Mailing Lists, Prev: Distribution, Up: Various @@ -4211,7 +4207,7 @@ A.1 GNU Free Documentation License Version 1.3, 3 November 2008 - Copyright © 2000, 2001, 2002, 2007, 2008, 2015 Free Software + Copyright © 2000-2002, 2007-2008, 2015, 2018 Free Software Foundation, Inc. @@ -4985,59 +4981,59 @@ Concept Index  Tag Table: -Node: Top823 -Node: Overview2234 -Node: Invoking5926 -Node: URL Format6786 -Ref: URL Format-Footnote-19465 -Node: Option Syntax9571 -Node: Basic Startup Options12349 -Node: Logging and Input File Options13207 -Node: Download Options18591 -Node: Directory Options48157 -Node: HTTP Options51008 -Node: HTTPS (SSL/TLS) Options71376 -Node: FTP Options83909 -Node: Recursive Retrieval Options90971 -Node: Recursive Accept/Reject Options100228 -Node: Exit Status104433 -Node: Recursive Download105468 -Node: Following Links108707 -Node: Spanning Hosts109673 -Node: Types of Files111942 -Node: Directory-Based Limits116836 -Node: Relative Links120103 -Node: FTP Links120953 -Node: Time-Stamping121844 -Node: Time-Stamping Usage123516 -Node: HTTP Time-Stamping Internals125388 -Ref: HTTP Time-Stamping Internals-Footnote-1126736 -Node: FTP Time-Stamping Internals126939 -Node: Startup File128426 -Node: Wgetrc Location129366 -Node: Wgetrc Syntax130220 -Node: Wgetrc Commands130985 -Node: Sample Wgetrc147578 -Node: Examples153606 -Node: Simple Usage153967 -Node: Advanced Usage155416 -Node: Very Advanced Usage159232 -Node: Various160776 -Node: Proxies161485 -Node: Distribution164442 -Node: Web Site164786 -Node: Mailing Lists165086 -Node: Internet Relay Chat166823 -Node: Reporting Bugs167118 -Node: Portability169687 -Node: Signals171334 -Node: Appendices172041 -Node: Robot Exclusion172389 -Node: Security Considerations176251 -Node: Contributors177461 -Node: Copying this manual183191 -Node: GNU Free Documentation License183431 -Node: Concept Index208785 +Node: Top744 +Node: Overview2076 +Node: Invoking5768 +Node: URL Format6628 +Ref: URL Format-Footnote-19307 +Node: Option Syntax9413 +Node: Basic Startup Options12191 +Node: Logging and Input File Options13049 +Node: Download Options18433 +Node: Directory Options47999 +Node: HTTP Options50850 +Node: HTTPS (SSL/TLS) Options71218 +Node: FTP Options83751 +Node: Recursive Retrieval Options90813 +Node: Recursive Accept/Reject Options100070 +Node: Exit Status104275 +Node: Recursive Download105310 +Node: Following Links108549 +Node: Spanning Hosts109515 +Node: Types of Files111784 +Node: Directory-Based Limits116678 +Node: Relative Links119945 +Node: FTP Links120795 +Node: Time-Stamping121686 +Node: Time-Stamping Usage123358 +Node: HTTP Time-Stamping Internals125230 +Ref: HTTP Time-Stamping Internals-Footnote-1126578 +Node: FTP Time-Stamping Internals126781 +Node: Startup File128268 +Node: Wgetrc Location129208 +Node: Wgetrc Syntax130062 +Node: Wgetrc Commands130827 +Node: Sample Wgetrc147420 +Node: Examples153448 +Node: Simple Usage153809 +Node: Advanced Usage155258 +Node: Very Advanced Usage159074 +Node: Various160618 +Node: Proxies161327 +Node: Distribution164284 +Node: Web Site164628 +Node: Mailing Lists164928 +Node: Internet Relay Chat166665 +Node: Reporting Bugs166960 +Node: Portability169529 +Node: Signals171176 +Node: Appendices171883 +Node: Robot Exclusion172231 +Node: Security Considerations176093 +Node: Contributors177303 +Node: Copying this manual183033 +Node: GNU Free Documentation License183273 +Node: Concept Index208625  End Tag Table diff --git a/doc/wget.texi b/doc/wget.texi index 31aef52..3ec609f 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -31,9 +31,8 @@ This file documents the GNU Wget utility for downloading network data. @c man begin COPYRIGHT -Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software -Foundation, Inc. +Copyright @copyright{} 1996-2011, 2015, 2018 Free Software Foundation, +Inc. @iftex Permission is granted to make and distribute verbatim copies of diff --git a/lib/Makefile.am b/lib/Makefile.am index b11e393..e26a291 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -13,7 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this file. If not, see . +# along with this file. If not, see . # # As a special exception to the GNU General Public License, # this file may be distributed as part of a program that @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl accept alloca announce-gen base32 bind c-ctype c-strcase c-strcasestr clock-time close connect crypto/md2 crypto/md4 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dirname fcntl flock fnmatch fopen ftello futimens getaddrinfo getline getopt-gnu getpass-gnu getpeername getsockname gettext git-version-gen gitlog-to-changelog gnupload group-member hostent iconv iconv-h inet_ntop intprops inttypes ioctl langinfo libunistring-optional limits-h link listen maintainer-makefile mbiter mbtowc memrchr mkdir mkostemp mkstemp nanosleep open pipe-posix posix_spawn quote quotearg recv regex select send setsockopt signal-h sigpipe sigprocmask snprintf socket spawn-pipe stat stdbool stdint strcase strerror_r-posix strpbrk strptime strtok_r strtoll symlink sys_types timegm tmpdir unicase/u8-tolower unistr/u8-strlen unlink unlocked-io update-copyright utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=lib/ --m4-base=m4/ --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl accept alloca announce-gen base32 bind c-ctype c-strcase c-strcasestr clock-time close connect dirname fcntl flock fnmatch fopen futimens ftello getaddrinfo getline getopt-gnu getpass-gnu getpeername getsockname gettext gitlog-to-changelog git-version-gen gnupload group-member hostent ioctl iconv iconv-h inet_ntop intprops inttypes langinfo limits-h link listen maintainer-makefile mbiter mbtowc memrchr mkdir mkstemp mkostemp nanosleep crypto/md2 crypto/md4 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 open pipe-posix posix_spawn quote quotearg recv regex select send setsockopt signal-h sigprocmask sigpipe snprintf socket spawn-pipe stat stdbool stdint strcase strerror_r-posix strpbrk strptime strtok_r strtoll symlink sys_types timegm tmpdir unlink unlocked-io update-copyright libunistring-optional unistr/u8-strlen unicase/u8-tolower utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects @@ -37,6 +37,7 @@ MOSTLYCLEANDIRS = CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = +SUBDIRS += AM_CPPFLAGS = AM_CFLAGS = @@ -475,6 +476,13 @@ libgnu_a_SOURCES += fd-safer-flag.c dup-safer-flag.c ## end gnulib module fd-safer-flag +## begin gnulib module filename + + +EXTRA_DIST += filename.h + +## end gnulib module filename + ## begin gnulib module flexmember @@ -578,9 +586,9 @@ EXTRA_libgnu_a_SOURCES += fseeko.c ## begin gnulib module fstat -EXTRA_DIST += fstat.c +EXTRA_DIST += fstat.c stat-w32.c stat-w32.h -EXTRA_libgnu_a_SOURCES += fstat.c +EXTRA_libgnu_a_SOURCES += fstat.c stat-w32.c ## end gnulib module fstat @@ -658,11 +666,11 @@ EXTRA_libgnu_a_SOURCES += getline.c ## begin gnulib module getopt-posix -BUILT_SOURCES += $(GETOPT_H) +BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +getopt.h: getopt.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -675,9 +683,18 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) < $(srcdir)/getopt.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += getopt.h getopt.h-t -EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t + +EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c @@ -770,6 +787,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gitlog-to-changelog ## begin gnulib module gnumakefile +EXTRA_DIST += $(top_srcdir)/GNUmakefile distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile @@ -1137,6 +1155,15 @@ EXTRA_libgnu_a_SOURCES += localeconv.c ## end gnulib module localeconv +## begin gnulib module localtime-buffer + + +EXTRA_DIST += localtime-buffer.c localtime-buffer.h + +EXTRA_libgnu_a_SOURCES += localtime-buffer.c + +## end gnulib module localtime-buffer + ## begin gnulib module lock libgnu_a_SOURCES += glthread/lock.h glthread/lock.c @@ -1165,6 +1192,8 @@ EXTRA_libgnu_a_SOURCES += lstat.c EXTRA_DIST += $(top_srcdir)/maint.mk +EXTRA_DIST += $(top_srcdir)/maint.mk + ## end gnulib module maintainer-makefile ## begin gnulib module malloc-posix @@ -1176,6 +1205,14 @@ EXTRA_libgnu_a_SOURCES += malloc.c ## end gnulib module malloc-posix +## begin gnulib module malloca + +libgnu_a_SOURCES += malloca.c + +EXTRA_DIST += malloca.h malloca.valgrind + +## end gnulib module malloca + ## begin gnulib module mbchar libgnu_a_SOURCES += mbchar.c @@ -1738,106 +1775,60 @@ libgnu_a_SOURCES += size_max.h ## begin gnulib module snippet/_Noreturn # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h +_NORETURN_H=$(srcdir)/_Noreturn.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h +EXTRA_DIST += _Noreturn.h ## end gnulib module snippet/_Noreturn ## begin gnulib module snippet/arg-nonnull -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += arg-nonnull.h -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -ARG_NONNULL_H=arg-nonnull.h +ARG_NONNULL_H=$(srcdir)/arg-nonnull.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h +EXTRA_DIST += arg-nonnull.h ## end gnulib module snippet/arg-nonnull ## begin gnulib module snippet/c++defs -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += c++defs.h -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += c++defs.h c++defs.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -CXXDEFS_H=c++defs.h +CXXDEFS_H=$(srcdir)/c++defs.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h +EXTRA_DIST += c++defs.h ## end gnulib module snippet/c++defs ## begin gnulib module snippet/unused-parameter -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += unused-parameter.h -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -UNUSED_PARAMETER_H=unused-parameter.h +UNUSED_PARAMETER_H=$(srcdir)/unused-parameter.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h +EXTRA_DIST += unused-parameter.h ## end gnulib module snippet/unused-parameter ## begin gnulib module snippet/warn-on-use -BUILT_SOURCES += warn-on-use.h -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -WARN_ON_USE_H=warn-on-use.h +WARN_ON_USE_H=$(srcdir)/warn-on-use.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h +EXTRA_DIST += warn-on-use.h ## end gnulib module snippet/warn-on-use @@ -1931,9 +1922,9 @@ libgnu_a_SOURCES += spawn-pipe.h spawn-pipe.c w32spawn.h ## begin gnulib module stat -EXTRA_DIST += stat.c +EXTRA_DIST += stat-w32.c stat-w32.h stat.c -EXTRA_libgnu_a_SOURCES += stat.c +EXTRA_libgnu_a_SOURCES += stat-w32.c stat.c ## end gnulib module stat @@ -2239,6 +2230,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ + -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ @@ -2257,6 +2249,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ + -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ @@ -2269,10 +2262,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ + -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ + -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ @@ -2383,6 +2378,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ @@ -2421,7 +2417,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ @@ -2442,20 +2439,20 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ + -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ + -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ @@ -2732,6 +2729,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ @@ -2745,6 +2743,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -2828,6 +2827,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ < $(srcdir)/sys_types.in.h; \ } > $@-t && \ mv $@-t $@ @@ -2921,24 +2921,31 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ + -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ + -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -3047,7 +3054,7 @@ EXTRA_DIST += unicase/caseprop.h unicase/ignorable.h unictype/bitmap.h libgnu_a_SOURCES += unicase/special-casing.c -unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf +$(srcdir)/unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \ mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h BUILT_SOURCES += unicase/special-casing-table.h @@ -3055,7 +3062,19 @@ MOSTLYCLEANFILES += unicase/special-casing-table.h-t MAINTAINERCLEANFILES += unicase/special-casing-table.h EXTRA_DIST += unicase/special-casing-table.h -EXTRA_DIST += unicase/special-casing-table.gperf unicase/special-casing.h +# Generate special-casing.h with a declaration that depends on the gperf version. +unicase/special-casing.h: unicase/special-casing.in.h unicase/special-casing-table.h + $(AM_V_at)$(MKDIR_P) unicase + $(AM_V_GEN)rm -f $@-t $@ && \ + declaration=`grep '^gl_unicase_special_lookup' $(srcdir)/unicase/special-casing-table.h | sed -e 's/register //g'` && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/$${declaration};/" $(srcdir)/unicase/special-casing.in.h; \ + } > $@-t && \ + mv -f $@-t $@ +BUILT_SOURCES += unicase/special-casing.h +MOSTLYCLEANFILES += unicase/special-casing.h unicase/special-casing.h-t + +EXTRA_DIST += unicase/special-casing-table.gperf unicase/special-casing.in.h ## end gnulib module unicase/special-casing @@ -3213,6 +3232,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ @@ -3250,6 +3270,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -3269,6 +3290,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ @@ -3291,6 +3313,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ + -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -3439,6 +3462,50 @@ EXTRA_DIST += $(top_srcdir)/build-aux/useless-if-before-free ## end gnulib module useless-if-before-free +## begin gnulib module utime + + +EXTRA_DIST += utime.c + +EXTRA_libgnu_a_SOURCES += utime.c + +## end gnulib module utime + +## begin gnulib module utime-h + +BUILT_SOURCES += $(UTIME_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_UTIME_H +utime.h: utime.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_UTIME_H''@/$(HAVE_UTIME_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UTIME_H''@|$(NEXT_UTIME_H)|g' \ + -e 's/@''GNULIB_UTIME''@/$(GNULIB_UTIME)/g' \ + -e 's|@''HAVE_UTIME''@|$(HAVE_UTIME)|g' \ + -e 's|@''REPLACE_UTIME''@|$(REPLACE_UTIME)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/utime.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +utime.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += utime.h utime.h-t + +EXTRA_DIST += utime.in.h + +## end gnulib module utime-h + ## begin gnulib module utimens libgnu_a_SOURCES += utimens.c @@ -3519,6 +3586,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ @@ -3559,6 +3627,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -3598,6 +3667,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ + -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ @@ -3614,6 +3684,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ @@ -3650,6 +3721,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 2efa04e..c6e0410 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -27,7 +27,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this file. If not, see . +# along with this file. If not, see . # # As a special exception to the GNU General Public License, # this file may be distributed as part of a program that @@ -35,7 +35,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl accept alloca announce-gen base32 bind c-ctype c-strcase c-strcasestr clock-time close connect crypto/md2 crypto/md4 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dirname fcntl flock fnmatch fopen ftello futimens getaddrinfo getline getopt-gnu getpass-gnu getpeername getsockname gettext git-version-gen gitlog-to-changelog gnupload group-member hostent iconv iconv-h inet_ntop intprops inttypes ioctl langinfo libunistring-optional limits-h link listen maintainer-makefile mbiter mbtowc memrchr mkdir mkostemp mkstemp nanosleep open pipe-posix posix_spawn quote quotearg recv regex select send setsockopt signal-h sigpipe sigprocmask snprintf socket spawn-pipe stat stdbool stdint strcase strerror_r-posix strpbrk strptime strtok_r strtoll symlink sys_types timegm tmpdir unicase/u8-tolower unistr/u8-strlen unlink unlocked-io update-copyright utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=lib/ --m4-base=m4/ --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl accept alloca announce-gen base32 bind c-ctype c-strcase c-strcasestr clock-time close connect dirname fcntl flock fnmatch fopen futimens ftello getaddrinfo getline getopt-gnu getpass-gnu getpeername getsockname gettext gitlog-to-changelog git-version-gen gnupload group-member hostent ioctl iconv iconv-h inet_ntop intprops inttypes langinfo limits-h link listen maintainer-makefile mbiter mbtowc memrchr mkdir mkstemp mkostemp nanosleep crypto/md2 crypto/md4 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 open pipe-posix posix_spawn quote quotearg recv regex select send setsockopt signal-h sigprocmask sigpipe snprintf socket spawn-pipe stat stdbool stdint strcase strerror_r-posix strpbrk strptime strtok_r strtoll symlink sys_types timegm tmpdir unlink unlocked-io update-copyright libunistring-optional unistr/u8-strlen unicase/u8-tolower utimens vasprintf vsnprintf wcwidth write xmemdup0 xstrndup @@ -156,7 +156,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -172,28 +173,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -231,17 +233,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ @@ -265,13 +268,14 @@ am__libgnu_a_SOURCES_DIST = base32.h base32.c binary-io.h binary-io.c \ fatal-signal.c fd-hook.c fd-safer-flag.c dup-safer-flag.c \ getprogname.h getprogname.c gettext.h gettime.c hard-locale.c \ localcharset.h localcharset.c glthread/lock.h glthread/lock.c \ - mbchar.c mbiter.h mbiter.c minmax.h pipe2.c pipe2-safer.c \ - quotearg.c sig-handler.c size_max.h sockets.h sockets.c \ - spawn-pipe.h spawn-pipe.c w32spawn.h stat-time.c strnlen1.h \ - strnlen1.c sys_socket.c tempname.c glthread/threadlib.c \ - timespec.c tmpdir.h tmpdir.c u64.c unicase/cased.c \ - unicase/empty-prefix-context.c unicase/empty-suffix-context.c \ - unicase/ignorable.c unicase/special-casing.c unicase/tolower.c \ + malloca.c mbchar.c mbiter.h mbiter.c minmax.h pipe2.c \ + pipe2-safer.c quotearg.c sig-handler.c size_max.h sockets.h \ + sockets.c spawn-pipe.h spawn-pipe.c w32spawn.h stat-time.c \ + strnlen1.h strnlen1.c sys_socket.c tempname.c \ + glthread/threadlib.c timespec.c tmpdir.h tmpdir.c u64.c \ + unicase/cased.c unicase/empty-prefix-context.c \ + unicase/empty-suffix-context.c unicase/ignorable.c \ + unicase/special-casing.c unicase/tolower.c \ unicase/u8-casemap.c unicase/u8-tolower.c \ unictype/combiningclass.c unictype/pr_soft_dotted.c \ uninorm/decompose-internal.c uninorm/u8-normalize.c unistd.c \ @@ -307,22 +311,23 @@ am_libgnu_a_OBJECTS = base32.$(OBJEXT) binary-io.$(OBJEXT) \ fd-safer-flag.$(OBJEXT) dup-safer-flag.$(OBJEXT) \ getprogname.$(OBJEXT) gettime.$(OBJEXT) hard-locale.$(OBJEXT) \ localcharset.$(OBJEXT) glthread/lock.$(OBJEXT) \ - mbchar.$(OBJEXT) mbiter.$(OBJEXT) pipe2.$(OBJEXT) \ - pipe2-safer.$(OBJEXT) quotearg.$(OBJEXT) sig-handler.$(OBJEXT) \ - sockets.$(OBJEXT) spawn-pipe.$(OBJEXT) stat-time.$(OBJEXT) \ - strnlen1.$(OBJEXT) sys_socket.$(OBJEXT) tempname.$(OBJEXT) \ - glthread/threadlib.$(OBJEXT) timespec.$(OBJEXT) \ - tmpdir.$(OBJEXT) u64.$(OBJEXT) unicase/cased.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) unicase/ignorable.$(OBJEXT) \ - unicase/special-casing.$(OBJEXT) $(am__objects_3) \ - unicase/u8-casemap.$(OBJEXT) $(am__objects_4) $(am__objects_5) \ - $(am__objects_6) uninorm/decompose-internal.$(OBJEXT) \ - $(am__objects_7) unistd.$(OBJEXT) dup-safer.$(OBJEXT) \ - fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) $(am__objects_8) \ - $(am__objects_9) $(am__objects_10) $(am__objects_11) \ - $(am__objects_12) utimens.$(OBJEXT) wait-process.$(OBJEXT) \ - wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \ - xsize.$(OBJEXT) xstrndup.$(OBJEXT) + malloca.$(OBJEXT) mbchar.$(OBJEXT) mbiter.$(OBJEXT) \ + pipe2.$(OBJEXT) pipe2-safer.$(OBJEXT) quotearg.$(OBJEXT) \ + sig-handler.$(OBJEXT) sockets.$(OBJEXT) spawn-pipe.$(OBJEXT) \ + stat-time.$(OBJEXT) strnlen1.$(OBJEXT) sys_socket.$(OBJEXT) \ + tempname.$(OBJEXT) glthread/threadlib.$(OBJEXT) \ + timespec.$(OBJEXT) tmpdir.$(OBJEXT) u64.$(OBJEXT) \ + unicase/cased.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ + unicase/ignorable.$(OBJEXT) unicase/special-casing.$(OBJEXT) \ + $(am__objects_3) unicase/u8-casemap.$(OBJEXT) $(am__objects_4) \ + $(am__objects_5) $(am__objects_6) \ + uninorm/decompose-internal.$(OBJEXT) $(am__objects_7) \ + unistd.$(OBJEXT) dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) \ + pipe-safer.$(OBJEXT) $(am__objects_8) $(am__objects_9) \ + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ + utimens.$(OBJEXT) wait-process.$(OBJEXT) wctype-h.$(OBJEXT) \ + xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) xsize.$(OBJEXT) \ + xstrndup.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) AM_V_P = $(am__v_P_@AM_V@) @@ -471,6 +476,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -487,6 +493,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -494,6 +501,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -566,6 +574,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -611,6 +620,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -659,6 +669,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -695,6 +706,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -718,7 +730,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -726,6 +740,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -749,6 +764,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -789,6 +805,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -811,12 +828,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -837,6 +856,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -930,6 +950,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -984,13 +1005,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -1007,6 +1032,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1037,6 +1063,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1071,6 +1099,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1142,6 +1171,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1175,6 +1205,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1213,10 +1244,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1325,6 +1358,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1341,11 +1375,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1354,6 +1391,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1384,6 +1422,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1391,6 +1430,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1401,7 +1442,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1460,7 +1500,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects -SUBDIRS = +SUBDIRS = noinst_HEADERS = noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = @@ -1482,31 +1522,34 @@ EXTRA_DIST = accept.c w32sock.h alloca.c alloca.in.h \ md4.h gl_openssl.h md5.h gl_openssl.h sha1.h gl_openssl.h \ sha256.h gl_openssl.h sha512.h stripslash.c dirname.h \ dosname.h dup2.c errno.in.h error.c error.h exitfail.h fcntl.c \ - fcntl.in.h fd-hook.h flexmember.h float.c float.in.h itold.c \ - flock.c fnmatch.c fnmatch.in.h fnmatch_loop.c fopen.c fseek.c \ - fseeko.c stdio-impl.h fstat.c ftell.c ftello.c stdio-impl.h \ - futimens.c gai_strerror.c getaddrinfo.c getdelim.c \ - getdtablesize.c getgroups.c getline.c getopt.c getopt.in.h \ - getopt1.c getopt_int.h getpass.c getpass.h getpeername.c \ - w32sock.h getsockname.c w32sock.h \ + fcntl.in.h fd-hook.h filename.h flexmember.h float.c \ + float.in.h itold.c flock.c fnmatch.c fnmatch.in.h \ + fnmatch_loop.c fopen.c fseek.c fseeko.c stdio-impl.h fstat.c \ + stat-w32.c stat-w32.h ftell.c ftello.c stdio-impl.h futimens.c \ + gai_strerror.c getaddrinfo.c getdelim.c getdtablesize.c \ + getgroups.c getline.c getopt-cdefs.in.h getopt-core.h \ + getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c \ + getopt.in.h getopt1.c getopt_int.h getpass.c getpass.h \ + getpeername.c w32sock.h getsockname.c w32sock.h \ $(top_srcdir)/build-aux/config.rpath gettimeofday.c \ $(top_srcdir)/build-aux/git-version-gen \ $(top_srcdir)/build-aux/gitlog-to-changelog \ - $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ - group-member.c hard-locale.h \ + $(top_srcdir)/GNUmakefile $(top_srcdir)/GNUmakefile \ + $(top_srcdir)/build-aux/gnupload group-member.c hard-locale.h \ $(top_srcdir)/build-aux/config.rpath iconv.in.h inet_ntop.c \ intprops.h inttypes.in.h ioctl.c w32sock.h iswblank.c \ langinfo.in.h libunistring.valgrind limits.in.h link.c \ listen.c w32sock.h config.charset ref-add.sin ref-del.sin \ - locale.in.h localeconv.c lseek.c lstat.c \ - $(top_srcdir)/maint.mk malloc.c mbchar.h mbrtowc.c mbsinit.c \ - mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h \ - mbtowc.c memchr.c memchr.valgrind memrchr.c mkdir.c mkostemp.c \ - mkstemp.c mktime-internal.h mktime.c mktime-internal.h \ - mktime.c msvc-inval.c msvc-inval.h msvc-nothrow.c \ - msvc-nothrow.h nanosleep.c netdb.in.h netinet_in.in.h \ - nl_langinfo.c open.c pathmax.h pipe.c spawn.c spawn_int.h \ - spawni.c spawn_faction_addclose.c spawn_int.h \ + locale.in.h localeconv.c localtime-buffer.c localtime-buffer.h \ + lseek.c lstat.c $(top_srcdir)/maint.mk $(top_srcdir)/maint.mk \ + malloc.c malloca.h malloca.valgrind mbchar.h mbrtowc.c \ + mbsinit.c mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c \ + mbtowc-impl.h mbtowc.c memchr.c memchr.valgrind memrchr.c \ + mkdir.c mkostemp.c mkstemp.c mktime-internal.h mktime.c \ + mktime-internal.h mktime.c msvc-inval.c msvc-inval.h \ + msvc-nothrow.c msvc-nothrow.h nanosleep.c netdb.in.h \ + netinet_in.in.h nl_langinfo.c open.c pathmax.h pipe.c spawn.c \ + spawn_int.h spawni.c spawn_faction_addclose.c spawn_int.h \ spawn_faction_adddup2.c spawn_int.h spawn_faction_addopen.c \ spawn_int.h spawn_faction_destroy.c spawn_faction_init.c \ spawn_int.h spawnattr_destroy.c spawnattr_init.c \ @@ -1516,12 +1559,9 @@ EXTRA_DIST = accept.c w32sock.h alloca.c alloca.in.h \ regex_internal.h regexec.c sched.in.h secure_getenv.c select.c \ send.c w32sock.h setsockopt.c w32sock.h sig-handler.h \ sigaction.c signal.in.h stdio-write.c sigprocmask.c \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ - $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - $(top_srcdir)/build-aux/snippet/c++defs.h \ - $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - $(top_srcdir)/build-aux/snippet/warn-on-use.h snprintf.c \ - socket.c w32sock.h w32sock.h spawn.in.h stat.c stat-time.h \ + _Noreturn.h arg-nonnull.h c++defs.h unused-parameter.h \ + warn-on-use.h snprintf.c socket.c w32sock.h w32sock.h \ + spawn.in.h stat-w32.c stat-w32.h stat.c stat-time.h \ stdalign.in.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \ stdlib.in.h strcasecmp.c strncasecmp.c strchrnul.c \ strchrnul.valgrind strdup.c streq.h strerror.c \ @@ -1535,7 +1575,7 @@ EXTRA_DIST = accept.c w32sock.h alloca.c alloca.in.h \ unicase.in.h unicase/cased.h unicase/caseprop.h \ unictype/bitmap.h unicase/caseprop.h unicase/ignorable.h \ unictype/bitmap.h unicase/special-casing-table.h \ - unicase/special-casing-table.gperf unicase/special-casing.h \ + unicase/special-casing-table.gperf unicase/special-casing.in.h \ unicase/simple-mapping.h unicase/tolower.h unicase/context.h \ unicase/u-casemap.h unicase/unicasemap.h unictype.in.h \ unictype/combiningclass.h unictype/bitmap.h \ @@ -1545,61 +1585,46 @@ EXTRA_DIST = accept.c w32sock.h alloca.c alloca.in.h \ unistd-safer.h unistr.in.h unistr/u-cpy.h unitypes.in.h \ localcharset.h uniwidth.in.h uniwidth/cjk.h unlink.c \ unlocked-io.h $(top_srcdir)/build-aux/update-copyright \ - $(top_srcdir)/build-aux/useless-if-before-free utimens.h \ - asnprintf.c float+.h printf-args.c printf-args.h \ - printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ - asprintf.c vasprintf.c $(top_srcdir)/build-aux/vc-list-files \ - verify.h vsnprintf.c waitpid.c wchar.in.h wcrtomb.c \ - wctype.in.h wcwidth.c write.c xalloc.h xalloc-oversized.h \ - xmemdup0.c xmemdup0.h - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. + $(top_srcdir)/build-aux/useless-if-before-free utime.c \ + utime.in.h utimens.h asnprintf.c float+.h printf-args.c \ + printf-args.h printf-parse.c printf-parse.h vasnprintf.c \ + vasnprintf.h asprintf.c vasprintf.c \ + $(top_srcdir)/build-aux/vc-list-files verify.h vsnprintf.c \ + waitpid.c wchar.in.h wcrtomb.c wctype.in.h wcwidth.c write.c \ + xalloc.h xalloc-oversized.h xmemdup0.c xmemdup0.h BUILT_SOURCES = $(ALLOCA_H) arpa/inet.h configmake.h $(ERRNO_H) \ - fcntl.h $(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) $(ICONV_H) \ - inttypes.h langinfo.h $(LIMITS_H) locale.h netdb.h \ - $(NETINET_IN_H) $(SCHED_H) signal.h arg-nonnull.h c++defs.h \ - unused-parameter.h warn-on-use.h spawn.h $(STDALIGN_H) \ + fcntl.h $(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) $(GETOPT_CDEFS_H) \ + $(ICONV_H) inttypes.h langinfo.h $(LIMITS_H) locale.h netdb.h \ + $(NETINET_IN_H) $(SCHED_H) signal.h spawn.h $(STDALIGN_H) \ $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \ strings.h sys/file.h sys/ioctl.h sys/select.h sys/socket.h \ sys/stat.h sys/time.h sys/types.h sys/uio.h sys/wait.h time.h \ $(LIBUNISTRING_UNICASE_H) unicase/special-casing-table.h \ - $(LIBUNISTRING_UNICTYPE_H) $(LIBUNISTRING_UNINORM_H) unistd.h \ - $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \ - $(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h + unicase/special-casing.h $(LIBUNISTRING_UNICTYPE_H) \ + $(LIBUNISTRING_UNINORM_H) unistd.h $(LIBUNISTRING_UNISTR_H) \ + $(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) \ + $(UTIME_H) wchar.h wctype.h SUFFIXES = .sed .sin MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arpa/inet.h \ arpa/inet.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h \ - float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t iconv.h \ - iconv.h-t inttypes.h inttypes.h-t langinfo.h langinfo.h-t \ - limits.h limits.h-t locale.h locale.h-t netdb.h netdb.h-t \ - netinet/in.h netinet/in.h-t sched.h sched.h-t signal.h \ - signal.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ - unused-parameter.h unused-parameter.h-t warn-on-use.h \ - warn-on-use.h-t spawn.h spawn.h-t stdalign.h stdalign.h-t \ - stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t \ - stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \ - strings.h strings.h-t sys/file.h sys/file.h-t sys/ioctl.h \ - sys/ioctl.h-t sys/select.h sys/select.h-t sys/socket.h \ - sys/socket.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ - sys/types.h sys/types.h-t sys/uio.h sys/uio.h-t sys/wait.h \ - sys/wait.h-t time.h time.h-t unicase.h unicase.h-t \ - unicase/special-casing-table.h-t unictype.h unictype.h-t \ - uninorm.h uninorm.h-t unistd.h unistd.h-t unistr.h unistr.h-t \ - unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t wchar.h \ - wchar.h-t wctype.h wctype.h-t + float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t \ + getopt-cdefs.h getopt-cdefs.h-t iconv.h iconv.h-t inttypes.h \ + inttypes.h-t langinfo.h langinfo.h-t limits.h limits.h-t \ + locale.h locale.h-t netdb.h netdb.h-t netinet/in.h \ + netinet/in.h-t sched.h sched.h-t signal.h signal.h-t spawn.h \ + spawn.h-t stdalign.h stdalign.h-t stdbool.h stdbool.h-t \ + stddef.h stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t \ + stdlib.h stdlib.h-t string.h string.h-t strings.h strings.h-t \ + sys/file.h sys/file.h-t sys/ioctl.h sys/ioctl.h-t sys/select.h \ + sys/select.h-t sys/socket.h sys/socket.h-t sys/stat.h \ + sys/stat.h-t sys/time.h sys/time.h-t sys/types.h sys/types.h-t \ + sys/uio.h sys/uio.h-t sys/wait.h sys/wait.h-t time.h time.h-t \ + unicase.h unicase.h-t unicase/special-casing-table.h-t \ + unicase/special-casing.h unicase/special-casing.h-t unictype.h \ + unictype.h-t uninorm.h uninorm.h-t unistd.h unistd.h-t \ + unistr.h unistr.h-t unitypes.h unitypes.h-t uniwidth.h \ + uniwidth.h-t utime.h utime.h-t wchar.h wchar.h-t wctype.h \ + wctype.h-t MOSTLYCLEANDIRS = arpa netinet sys sys sys sys sys sys sys CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ ref-del.sed @@ -1615,16 +1640,16 @@ libgnu_a_SOURCES = base32.h base32.c binary-io.h binary-io.c c-ctype.h \ fatal-signal.c fd-hook.c fd-safer-flag.c dup-safer-flag.c \ getprogname.h getprogname.c gettext.h gettime.c hard-locale.c \ localcharset.h localcharset.c glthread/lock.h glthread/lock.c \ - mbchar.c mbiter.h mbiter.c minmax.h pipe2.c pipe2-safer.c \ - quotearg.c sig-handler.c size_max.h sockets.h sockets.c \ - spawn-pipe.h spawn-pipe.c w32spawn.h stat-time.c strnlen1.h \ - strnlen1.c sys_socket.c tempname.c glthread/threadlib.c \ - timespec.c tmpdir.h tmpdir.c u64.c unicase/cased.c \ - $(am__append_1) $(am__append_2) unicase/ignorable.c \ - unicase/special-casing.c $(am__append_3) unicase/u8-casemap.c \ - $(am__append_4) $(am__append_5) $(am__append_6) \ - uninorm/decompose-internal.c $(am__append_7) unistd.c \ - dup-safer.c fd-safer.c pipe-safer.c $(am__append_8) \ + malloca.c mbchar.c mbiter.h mbiter.c minmax.h pipe2.c \ + pipe2-safer.c quotearg.c sig-handler.c size_max.h sockets.h \ + sockets.c spawn-pipe.h spawn-pipe.c w32spawn.h stat-time.c \ + strnlen1.h strnlen1.c sys_socket.c tempname.c \ + glthread/threadlib.c timespec.c tmpdir.h tmpdir.c u64.c \ + unicase/cased.c $(am__append_1) $(am__append_2) \ + unicase/ignorable.c unicase/special-casing.c $(am__append_3) \ + unicase/u8-casemap.c $(am__append_4) $(am__append_5) \ + $(am__append_6) uninorm/decompose-internal.c $(am__append_7) \ + unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_8) \ $(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_12) utimens.c wait-process.h wait-process.c \ wctype-h.c xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h \ @@ -1634,28 +1659,29 @@ libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ EXTRA_libgnu_a_SOURCES = accept.c alloca.c bind.c btowc.c close.c \ connect.c stripslash.c dup2.c error.c fcntl.c float.c itold.c \ flock.c fnmatch.c fnmatch_loop.c fopen.c fseek.c fseeko.c \ - fstat.c ftell.c ftello.c futimens.c gai_strerror.c \ + fstat.c stat-w32.c ftell.c ftello.c futimens.c gai_strerror.c \ getaddrinfo.c getdelim.c getdtablesize.c getgroups.c getline.c \ getopt.c getopt1.c getpass.c getpeername.c getsockname.c \ gettimeofday.c group-member.c inet_ntop.c ioctl.c iswblank.c \ - link.c listen.c localeconv.c lseek.c lstat.c malloc.c \ - mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c \ - memchr.c memrchr.c mkdir.c mkostemp.c mkstemp.c mktime.c \ - mktime.c msvc-inval.c msvc-nothrow.c nanosleep.c nl_langinfo.c \ - open.c pipe.c spawn.c spawni.c spawn_faction_addclose.c \ - spawn_faction_adddup2.c spawn_faction_addopen.c \ - spawn_faction_destroy.c spawn_faction_init.c \ - spawnattr_destroy.c spawnattr_init.c spawnattr_setflags.c \ - spawnattr_setsigmask.c spawnp.c raise.c rawmemchr.c recv.c \ - regcomp.c regex.c regex_internal.c regexec.c secure_getenv.c \ - select.c send.c setsockopt.c sigaction.c stdio-write.c \ - sigprocmask.c snprintf.c socket.c stat.c strcasecmp.c \ - strncasecmp.c strchrnul.c strdup.c strerror.c \ - strerror-override.c strerror_r.c strndup.c strnlen.c strpbrk.c \ - strptime.c strtok_r.c strtol.c strtoll.c symlink.c time_r.c \ - timegm.c unlink.c asnprintf.c printf-args.c printf-parse.c \ - vasnprintf.c asprintf.c vasprintf.c vsnprintf.c waitpid.c \ - wcrtomb.c wcwidth.c write.c xmemdup0.c + link.c listen.c localeconv.c localtime-buffer.c lseek.c \ + lstat.c malloc.c mbrtowc.c mbsinit.c mbsrtowcs-state.c \ + mbsrtowcs.c mbtowc.c memchr.c memrchr.c mkdir.c mkostemp.c \ + mkstemp.c mktime.c mktime.c msvc-inval.c msvc-nothrow.c \ + nanosleep.c nl_langinfo.c open.c pipe.c spawn.c spawni.c \ + spawn_faction_addclose.c spawn_faction_adddup2.c \ + spawn_faction_addopen.c spawn_faction_destroy.c \ + spawn_faction_init.c spawnattr_destroy.c spawnattr_init.c \ + spawnattr_setflags.c spawnattr_setsigmask.c spawnp.c raise.c \ + rawmemchr.c recv.c regcomp.c regex.c regex_internal.c \ + regexec.c secure_getenv.c select.c send.c setsockopt.c \ + sigaction.c stdio-write.c sigprocmask.c snprintf.c socket.c \ + stat-w32.c stat.c strcasecmp.c strncasecmp.c strchrnul.c \ + strdup.c strerror.c strerror-override.c strerror_r.c strndup.c \ + strnlen.c strpbrk.c strptime.c strtok_r.c strtol.c strtoll.c \ + symlink.c time_r.c timegm.c unlink.c utime.c asnprintf.c \ + printf-args.c printf-parse.c vasnprintf.c asprintf.c \ + vasprintf.c vsnprintf.c waitpid.c wcrtomb.c wcwidth.c write.c \ + xmemdup0.c # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression @@ -1669,13 +1695,29 @@ charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -UNUSED_PARAMETER_H = unused-parameter.h -WARN_ON_USE_H = warn-on-use.h +_NORETURN_H = $(srcdir)/_Noreturn.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +ARG_NONNULL_H = $(srcdir)/arg-nonnull.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +CXXDEFS_H = $(srcdir)/c++defs.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +UNUSED_PARAMETER_H = $(srcdir)/unused-parameter.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +WARN_ON_USE_H = $(srcdir)/warn-on-use.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1884,9 +1926,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbchar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbiter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ @@ -1949,6 +1993,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawni.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawnp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio-write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ @@ -1977,6 +2022,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u64.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@ @@ -2484,7 +2530,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +getopt.h: getopt.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -2498,6 +2544,13 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) } > $@-t && \ mv -f $@-t $@ +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile @@ -2781,41 +2834,6 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H < $(srcdir)/signal.in.h; \ } > $@-t && \ mv $@-t $@ -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ # We need the following in order to create a replacement for when # the system doesn't have one. @@ -3096,6 +3114,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ + -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ @@ -3114,6 +3133,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ + -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ @@ -3126,10 +3146,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ + -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ + -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ @@ -3170,6 +3192,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ @@ -3208,7 +3231,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ @@ -3229,20 +3253,20 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ + -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ + -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ @@ -3391,6 +3415,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ @@ -3404,6 +3429,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -3468,6 +3494,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ < $(srcdir)/sys_types.in.h; \ } > $@-t && \ mv $@-t $@ @@ -3516,24 +3543,31 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ + -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ + -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -3552,10 +3586,20 @@ unicase.h: unicase.in.h } > $@-t && \ mv -f $@-t $@ -unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf +$(srcdir)/unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \ mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h +# Generate special-casing.h with a declaration that depends on the gperf version. +unicase/special-casing.h: unicase/special-casing.in.h unicase/special-casing-table.h + $(AM_V_at)$(MKDIR_P) unicase + $(AM_V_GEN)rm -f $@-t $@ && \ + declaration=`grep '^gl_unicase_special_lookup' $(srcdir)/unicase/special-casing-table.h | sed -e 's/register //g'` && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/$${declaration};/" $(srcdir)/unicase/special-casing.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + unictype.h: unictype.in.h $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ @@ -3623,6 +3667,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ @@ -3660,6 +3705,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -3679,6 +3725,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ @@ -3701,6 +3748,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ + -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -3735,6 +3783,29 @@ uniwidth.h: uniwidth.in.h } > $@-t && \ mv -f $@-t $@ +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_UTIME_H_TRUE@utime.h: utime.in.h $(top_builddir)/config.status +@GL_GENERATE_UTIME_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_UTIME_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_UTIME_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's/@''HAVE_UTIME_H''@/$(HAVE_UTIME_H)/g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''NEXT_UTIME_H''@|$(NEXT_UTIME_H)|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's/@''GNULIB_UTIME''@/$(GNULIB_UTIME)/g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''HAVE_UTIME''@|$(HAVE_UTIME)|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e 's|@''REPLACE_UTIME''@|$(REPLACE_UTIME)|g' \ +@GL_GENERATE_UTIME_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@GL_GENERATE_UTIME_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@GL_GENERATE_UTIME_H_TRUE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@GL_GENERATE_UTIME_H_TRUE@ < $(srcdir)/utime.in.h; \ +@GL_GENERATE_UTIME_H_TRUE@ } > $@-t && \ +@GL_GENERATE_UTIME_H_TRUE@ mv $@-t $@ +@GL_GENERATE_UTIME_H_FALSE@utime.h: $(top_builddir)/config.status +@GL_GENERATE_UTIME_H_FALSE@ rm -f $@ + # We need the following in order to create when the system # version does not work standalone. wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @@ -3747,6 +3818,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ @@ -3787,6 +3859,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -3826,6 +3899,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ + -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ @@ -3842,6 +3916,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ @@ -3859,6 +3934,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h new file mode 100644 index 0000000..c44ad89 --- /dev/null +++ b/lib/_Noreturn.h @@ -0,0 +1,10 @@ +#if !defined _Noreturn && __STDC_VERSION__ < 201112 +# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ + || 0x5110 <= __SUNPRO_C) +# define _Noreturn __attribute__ ((__noreturn__)) +# elif 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn +# endif +#endif diff --git a/lib/accept.c b/lib/accept.c index 08bb4d9..9659c71 100644 --- a/lib/accept.c +++ b/lib/accept.c @@ -1,6 +1,6 @@ /* accept.c --- wrappers for Windows accept function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/alloca.in.h b/lib/alloca.in.h index c3dc38a..5ad8af8 100644 --- a/lib/alloca.in.h +++ b/lib/alloca.in.h @@ -1,6 +1,6 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see - . + . */ /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h new file mode 100644 index 0000000..5f03408 --- /dev/null +++ b/lib/arg-nonnull.h @@ -0,0 +1,26 @@ +/* A C macro for declaring that specific arguments must not be NULL. + Copyright (C) 2009-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools + that the values passed as arguments n, ..., m must be non-NULL pointers. + n = 1 stands for the first argument, n = 2 for the second argument etc. */ +#ifndef _GL_ARG_NONNULL +# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) +# else +# define _GL_ARG_NONNULL(params) +# endif +#endif diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index dc3d2bd..3253d79 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_ARPA_INET_H diff --git a/lib/array-mergesort.h b/lib/array-mergesort.h index f00dea2..6988dfe 100644 --- a/lib/array-mergesort.h +++ b/lib/array-mergesort.h @@ -1,5 +1,5 @@ /* Stable-sorting of an array using mergesort. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* This file implements stable sorting of an array, using the mergesort algorithm. diff --git a/lib/asnprintf.c b/lib/asnprintf.c index 14ab3e8..2298455 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/asprintf.c b/lib/asprintf.c index 6635f49..061072f 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2017 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/base32.c b/lib/base32.c index 53a2d23..20c85ec 100644 --- a/lib/base32.c +++ b/lib/base32.c @@ -1,5 +1,5 @@ /* base32.c -- Encode binary data using printable characters. - Copyright (C) 1999-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,11 +12,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Adapted from Simon Josefsson's base64 code by Gijs van Tulder. * - * See also RFC 4648 . + * See also RFC 4648 . * * Be careful with error checking. Here is how you would typically * use these functions: diff --git a/lib/base32.h b/lib/base32.h index c4e550f..6c408e8 100644 --- a/lib/base32.h +++ b/lib/base32.h @@ -1,5 +1,5 @@ /* base32.h -- Encode binary data using printable characters. - Copyright (C) 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2009-2018 Free Software Foundation, Inc. Adapted from Simon Josefsson's base64 code by Gijs van Tulder. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef BASE32_H # define BASE32_H diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 54d3cc0..33f9994 100644 --- a/lib/basename-lgpl.c +++ b/lib/basename-lgpl.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/basename.c b/lib/basename.c index 0353635..02adb8c 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/binary-io.c b/lib/binary-io.c index d828bcd..f9cc4dd 100644 --- a/lib/binary-io.c +++ b/lib/binary-io.c @@ -1,4 +1,37 @@ +/* Binary mode I/O. + Copyright 2017-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + #define BINARY_IO_INLINE _GL_EXTERN_INLINE #include "binary-io.h" -typedef int dummy; + +#if defined __DJGPP__ || defined __EMX__ +# include +# include + +int +__gl_setmode_check (int fd) +{ + if (isatty (fd)) + { + errno = EINVAL; + return -1; + } + else + return 0; +} +#endif diff --git a/lib/binary-io.h b/lib/binary-io.h index f766439..cce1301 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _BINARY_H #define _BINARY_H @@ -33,15 +33,12 @@ _GL_INLINE_HEADER_BEGIN # define BINARY_IO_INLINE _GL_INLINE #endif -/* set_binary_mode (fd, mode) - sets the binary/text I/O mode of file descriptor fd to the given mode - (must be O_BINARY or O_TEXT) and returns the previous mode. */ #if O_BINARY # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__ # include /* declares setmode() */ -# define set_binary_mode setmode +# define __gl_setmode setmode # else -# define set_binary_mode _setmode +# define __gl_setmode _setmode # undef fileno # define fileno _fileno # endif @@ -50,7 +47,7 @@ _GL_INLINE_HEADER_BEGIN /* Use a function rather than a macro, to avoid gcc warnings "warning: statement with no effect". */ BINARY_IO_INLINE int -set_binary_mode (int fd, int mode) +__gl_setmode (int fd, int mode) { (void) fd; (void) mode; @@ -58,18 +55,29 @@ set_binary_mode (int fd, int mode) } #endif -/* SET_BINARY (fd); - changes the file descriptor fd to perform binary I/O. */ #if defined __DJGPP__ || defined __EMX__ -# include /* declares isatty() */ - /* Avoid putting stdin/stdout in binary mode if it is connected to - the console, because that would make it impossible for the user - to interrupt the program through Ctrl-C or Ctrl-Break. */ -# define SET_BINARY(fd) ((void) (!isatty (fd) ? (set_binary_mode (fd, O_BINARY), 0) : 0)) +extern int __gl_setmode_check (int); #else -# define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY)) +BINARY_IO_INLINE int +__gl_setmode_check (int fd) { return 0; } #endif +/* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. + Return the old mode if successful, -1 (setting errno) on failure. + Ordinarily this function would be called 'setmode', since that is + its name on MS-Windows, but it is called 'set_binary_mode' here + to avoid colliding with a BSD function of another name. */ + +BINARY_IO_INLINE int +set_binary_mode (int fd, int mode) +{ + int r = __gl_setmode_check (fd); + return r != 0 ? r : __gl_setmode (fd, mode); +} + +/* This macro is obsolescent. */ +#define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY)) + _GL_INLINE_HEADER_END #endif /* _BINARY_H */ diff --git a/lib/bind.c b/lib/bind.c index bde82d3..5c3556d 100644 --- a/lib/bind.c +++ b/lib/bind.c @@ -1,6 +1,6 @@ /* bind.c --- wrappers for Windows bind function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/btowc.c b/lib/btowc.c index 214d2b7..54124b2 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/c++defs.h b/lib/c++defs.h new file mode 100644 index 0000000..72ff1ff --- /dev/null +++ b/lib/c++defs.h @@ -0,0 +1,316 @@ +/* C++ compatible function declaration macros. + Copyright (C) 2010-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_CXXDEFS_H +#define _GL_CXXDEFS_H + +/* Begin/end the GNULIB_NAMESPACE namespace. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { +# define _GL_END_NAMESPACE } +#else +# define _GL_BEGIN_NAMESPACE +# define _GL_END_NAMESPACE +#endif + +/* The three most frequent use cases of these macros are: + + * For providing a substitute for a function that is missing on some + platforms, but is declared and works fine on the platforms on which + it exists: + + #if @GNULIB_FOO@ + # if !@HAVE_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on all platforms, + but is broken/insufficient and needs to be replaced on some platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on some platforms + but is broken/insufficient and needs to be replaced on some of them and + is additionally either missing or undeclared on some other platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif +*/ + +/* _GL_EXTERN_C declaration; + performs the declaration with C linkage. */ +#if defined __cplusplus +# define _GL_EXTERN_C extern "C" +#else +# define _GL_EXTERN_C extern +#endif + +/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); + declares a replacement function, named rpl_func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ +#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ + _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) +#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype rpl_func parameters_and_attributes + +/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); + declares the system function, named func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ +#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype func parameters_and_attributes + +/* _GL_CXXALIAS_RPL (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to rpl_func, if GNULIB_NAMESPACE is defined. + Example: + _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); + + Wrapping rpl_func in an object with an inline conversion operator + avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is + actually used in the program. */ +#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ + _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::rpl_func; \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); + is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); + except that the C function rpl_func may have a slightly different + declaration. A cast is used to silence the "invalid conversion" error + that would otherwise occur. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast(::rpl_func); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_SYS (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to the system provided function func, if GNULIB_NAMESPACE + is defined. + Example: + _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); + + Wrapping func in an object with an inline conversion operator + avoids a reference to func unless GNULIB_NAMESPACE::func is + actually used in the program. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::func; \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); + is like _GL_CXXALIAS_SYS (func, rettype, parameters); + except that the C function func may have a slightly different declaration. + A cast is used to silence the "invalid conversion" error that would + otherwise occur. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast(::func); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); + is like _GL_CXXALIAS_SYS (func, rettype, parameters); + except that the C function is picked among a set of overloaded functions, + namely the one with rettype2 and parameters2. Two consecutive casts + are used to silence the "cannot find a match" and "invalid conversion" + errors that would otherwise occur. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE + /* The outer cast must be a reinterpret_cast. + The inner cast: When the function is defined as a set of overloaded + functions, it works as a static_cast<>, choosing the designated variant. + When the function is defined as a single variant, it works as a + reinterpret_cast<>. The parenthesized cast syntax works both ways. */ +# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIASWARN (func); + causes a warning to be emitted when ::func is used but not when + GNULIB_NAMESPACE::func is used. func must be defined without overloaded + variants. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIASWARN(func) \ + _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) +# define _GL_CXXALIASWARN_1(func,namespace) \ + _GL_CXXALIASWARN_2 (func, namespace) +/* To work around GCC bug , + we enable the warning only when not optimizing. */ +# if !__OPTIMIZE__ +# define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_WARN_ON_USE (func, \ + "The symbol ::" #func " refers to the system function. " \ + "Use " #namespace "::" #func " instead.") +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +# define _GL_CXXALIASWARN_2(func,namespace) \ + extern __typeof__ (func) func +# else +# define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +# endif +#else +# define _GL_CXXALIASWARN(func) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); + causes a warning to be emitted when the given overloaded variant of ::func + is used but not when GNULIB_NAMESPACE::func is used. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ + GNULIB_NAMESPACE) +# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ + _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) +/* To work around GCC bug , + we enable the warning only when not optimizing. */ +# if !__OPTIMIZE__ +# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ + "The symbol ::" #func " refers to the system function. " \ + "Use " #namespace "::" #func " instead.") +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + extern __typeof__ (func) func +# else +# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +# endif +#else +# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +#endif /* _GL_CXXDEFS_H */ diff --git a/lib/c-ctype.h b/lib/c-ctype.h index bcdba6b..d55d4f6 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2018 Free Software Foundation, Inc. This 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 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, see . */ +along with this program; if not, see . */ #ifndef C_CTYPE_H #define C_CTYPE_H diff --git a/lib/c-strcase.h b/lib/c-strcase.h index c82dab1..41f439e 100644 --- a/lib/c-strcase.h +++ b/lib/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2017 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef C_STRCASE_H #define C_STRCASE_H diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index 5bce873..2b1ac99 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index aa5e71f..9bde9de 100644 --- a/lib/c-strcaseeq.h +++ b/lib/c-strcaseeq.h @@ -1,5 +1,5 @@ /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible . */ diff --git a/lib/c-strcasestr.c b/lib/c-strcasestr.c index f1ff254..5865d7b 100644 --- a/lib/c-strcasestr.c +++ b/lib/c-strcasestr.c @@ -1,5 +1,5 @@ /* c-strcasestr.c -- case insensitive substring search in C locale - Copyright (C) 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/c-strcasestr.h b/lib/c-strcasestr.h index 4f87e2f..c5d7df2 100644 --- a/lib/c-strcasestr.h +++ b/lib/c-strcasestr.h @@ -1,5 +1,5 @@ /* Case-insensitive searching in a string in C locale. - Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef C_STRCASESTR_H #define C_STRCASESTR_H diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index ada62d7..8151c1a 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/cloexec.c b/lib/cloexec.c index a5ad0b5..238ab18 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,6 +1,6 @@ -/* closexec.c - set or clear the close-on-exec descriptor flag +/* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . The code is taken from glibc/manual/llio.texi */ diff --git a/lib/cloexec.h b/lib/cloexec.h index 2990e82..5902805 100644 --- a/lib/cloexec.h +++ b/lib/cloexec.h @@ -1,6 +1,6 @@ -/* closexec.c - set or clear the close-on-exec descriptor flag +/* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . */ diff --git a/lib/close.c b/lib/close.c index 3e45187..01c326a 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -22,7 +22,9 @@ #include #include "fd-hook.h" -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #undef close diff --git a/lib/config.charset b/lib/config.charset index 8bedbf3..7101403 100644 --- a/lib/config.charset +++ b/lib/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, see . +# with this program; if not, see . # # The table consists of lines of the form # ALIAS CANONICAL diff --git a/lib/connect.c b/lib/connect.c index 9e2a36e..300a594 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1,6 +1,6 @@ /* connect.c --- wrappers for Windows connect function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index b549ca9..a40f6a9 100644 --- a/lib/dirname-lgpl.c +++ b/lib/dirname-lgpl.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/dirname.c b/lib/dirname.c index ed57557..766f862 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/dirname.h b/lib/dirname.h index dbf920b..69aeb86 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -1,6 +1,6 @@ /* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2017 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef DIRNAME_H_ # define DIRNAME_H_ 1 diff --git a/lib/dosname.h b/lib/dosname.h index dd5c177..66486d5 100644 --- a/lib/dosname.h +++ b/lib/dosname.h @@ -1,6 +1,6 @@ /* File names on MS-DOS/Windows systems. - Copyright (C) 2000-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . From Paul Eggert and Jim Meyering. */ diff --git a/lib/dup-safer-flag.c b/lib/dup-safer-flag.c index 53a6ac9..aa28194 100644 --- a/lib/dup-safer-flag.c +++ b/lib/dup-safer-flag.c @@ -1,7 +1,7 @@ /* Duplicate a file descriptor result, avoiding clobbering STD{IN,OUT,ERR}_FILENO, with specific flags. - Copyright (C) 2001, 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert and Eric Blake. */ diff --git a/lib/dup-safer.c b/lib/dup-safer.c index d00997c..1f1679e 100644 --- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -1,6 +1,6 @@ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/dup2.c b/lib/dup2.c index c0c7cad..c8b49b2 100644 --- a/lib/dup2.c +++ b/lib/dup2.c @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Paul Eggert */ @@ -35,10 +35,39 @@ # define WIN32_LEAN_AND_MEAN # include -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif + +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +dup2_nothrow (int fd, int desired_fd) +{ + int result; + + TRY_MSVC_INVAL + { + result = dup2 (fd, desired_fd); + } + CATCH_MSVC_INVAL + { + errno = EBADF; + result = -1; + } + DONE_MSVC_INVAL; + + return result; +} +# else +# define dup2_nothrow dup2 +# endif static int ms_windows_dup2 (int fd, int desired_fd) @@ -59,23 +88,14 @@ ms_windows_dup2 (int fd, int desired_fd) } /* Wine 1.0.1 return 0 when desired_fd is negative but not -1: - http://bugs.winehq.org/show_bug.cgi?id=21289 */ + https://bugs.winehq.org/show_bug.cgi?id=21289 */ if (desired_fd < 0) { errno = EBADF; return -1; } - TRY_MSVC_INVAL - { - result = dup2 (fd, desired_fd); - } - CATCH_MSVC_INVAL - { - errno = EBADF; - result = -1; - } - DONE_MSVC_INVAL; + result = dup2_nothrow (fd, desired_fd); if (result == 0) result = desired_fd; diff --git a/lib/errno.in.h b/lib/errno.in.h index 13194f9..8d2f307 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like . - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_ERRNO_H diff --git a/lib/error.c b/lib/error.c index 535d8a2..81788c7 100644 --- a/lib/error.c +++ b/lib/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by David MacKenzie . */ @@ -98,28 +98,32 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif # endif /* The gnulib override of fcntl is not needed in this file. */ # undef fcntl -# if !HAVE_DECL_STRERROR_R +# if !(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R) # ifndef HAVE_DECL_STRERROR_R "this configure-time declaration test was not run" # endif # if STRERROR_R_CHAR_P -char *strerror_r (); +char *strerror_r (int errnum, char *buf, size_t buflen); # else -int strerror_r (); +int strerror_r (int errnum, char *buf, size_t buflen); # endif # endif #define program_name getprogname () -# if HAVE_STRERROR_R || defined strerror_r +# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r # define __strerror_r strerror_r -# endif /* HAVE_STRERROR_R || defined strerror_r */ +# endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */ #endif /* not _LIBC */ #if !_LIBC @@ -172,9 +176,9 @@ print_errno_message (int errnum) { char const *s; -#if defined HAVE_STRERROR_R || _LIBC +#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R char errbuf[1024]; -# if _LIBC || STRERROR_R_CHAR_P +# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P) s = __strerror_r (errnum, errbuf, sizeof errbuf); # else if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) @@ -268,7 +272,6 @@ error_tail (int status, int errnum, const char *message, va_list args) else #endif vfprintf (stderr, message, args); - va_end (args); ++error_message_count; if (errnum) @@ -318,6 +321,7 @@ error (int status, int errnum, const char *message, ...) va_start (args, message); error_tail (status, errnum, message, args); + va_end (args); #ifdef _LIBC _IO_funlockfile (stderr); @@ -388,6 +392,7 @@ error_at_line (int status, int errnum, const char *file_name, va_start (args, message); error_tail (status, errnum, message, args); + va_end (args); #ifdef _LIBC _IO_funlockfile (stderr); diff --git a/lib/error.h b/lib/error.h index ef024d9..36401e1 100644 --- a/lib/error.h +++ b/lib/error.h @@ -1,5 +1,5 @@ /* Declaration for error-reporting function - Copyright (C) 1995-1997, 2003, 2006, 2008-2017 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _ERROR_H #define _ERROR_H 1 diff --git a/lib/exitfail.c b/lib/exitfail.c index 524eb5c..19c5cba 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/exitfail.h b/lib/exitfail.h index 895511f..a42057b 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,6 +13,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ extern int volatile exit_failure; diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index bb159d7..9d795f7 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h index 45fa71c..41b4af7 100644 --- a/lib/fatal-signal.h +++ b/lib/fatal-signal.h @@ -1,5 +1,5 @@ /* Emergency actions in case of a fatal signal. - Copyright (C) 2003-2004, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifdef __cplusplus diff --git a/lib/fcntl.c b/lib/fcntl.c index afe1546..b8cb271 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Eric Blake . */ @@ -38,7 +38,11 @@ # include /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif /* Upper bound on getdtablesize(). See lib/getdtablesize.c. */ # define OPEN_MAX_MAX 0x10000 diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 4a1d40a..719a54d 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Paul Eggert */ @@ -213,7 +213,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " #endif #ifndef O_CLOEXEC -# define O_CLOEXEC 0 +# define O_CLOEXEC 0x40000000 /* Try to not collide with system O_* flags. */ +# define GNULIB_defined_O_CLOEXEC 1 +#else +# define GNULIB_defined_O_CLOEXEC 0 #endif #ifndef O_DIRECT diff --git a/lib/fd-hook.c b/lib/fd-hook.c index ab5847a..95a0662 100644 --- a/lib/fd-hook.c +++ b/lib/fd-hook.c @@ -1,5 +1,5 @@ -/* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2017 Free Software Foundation, Inc. +/* Hook for making file descriptor functions close(), ioctl() extensible. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/fd-hook.h b/lib/fd-hook.h index fe0d1b0..dbc5b67 100644 --- a/lib/fd-hook.h +++ b/lib/fd-hook.h @@ -1,5 +1,5 @@ -/* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2017 Free Software Foundation, Inc. +/* Hook for making file descriptor functions close(), ioctl() extensible. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef FD_HOOK_H diff --git a/lib/fd-safer-flag.c b/lib/fd-safer-flag.c index 59071ef..b757484 100644 --- a/lib/fd-safer-flag.c +++ b/lib/fd-safer-flag.c @@ -1,7 +1,7 @@ /* Adjust a file descriptor result so that it avoids clobbering STD{IN,OUT,ERR}_FILENO, with specific flags. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert and Eric Blake. */ diff --git a/lib/fd-safer.c b/lib/fd-safer.c index da09128..1ea9a49 100644 --- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -1,6 +1,6 @@ /* Return a safer copy of a file descriptor. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/filename.h b/lib/filename.h new file mode 100644 index 0000000..a8127e8 --- /dev/null +++ b/lib/filename.h @@ -0,0 +1,54 @@ +/* Basic filename support macros. + Copyright (C) 2001-2004, 2007-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 _FILENAME_H +#define _FILENAME_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ + /* Native Windows, Cygwin, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +# define FILE_SYSTEM_PREFIX_LEN(P) 0 +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _FILENAME_H */ diff --git a/lib/flexmember.h b/lib/flexmember.h index c71ea65..7e3f598 100644 --- a/lib/flexmember.h +++ b/lib/flexmember.h @@ -1,19 +1,22 @@ /* Sizes of structs with flexible array members. - Copyright 2016-2017 Free Software Foundation, Inc. + Copyright 2016-2018 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This file is part of the GNU C Library. - This program is distributed in the hope that it will be useful, + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . Written by Paul Eggert. */ diff --git a/lib/float+.h b/lib/float+.h index ba8ecb7..2cb858f 100644 --- a/lib/float+.h +++ b/lib/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _FLOATPLUS_H #define _FLOATPLUS_H diff --git a/lib/float.c b/lib/float.c index b9103ec..7caca83 100644 --- a/lib/float.c +++ b/lib/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for . - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/float.in.h b/lib/float.in.h index 3e01200..2cdbd12 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _@GUARD_PREFIX@_FLOAT_H @@ -62,8 +62,8 @@ /* On FreeBSD/x86 6.4, the 'long double' type really has only 53 bits of precision in the compiler but 64 bits of precision at runtime. See - . */ -#if defined __i386__ && defined __FreeBSD__ + . */ +#if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__) /* Number of mantissa units, in base FLT_RADIX. */ # undef LDBL_MANT_DIG # define LDBL_MANT_DIG 64 @@ -81,7 +81,7 @@ # define LDBL_MAX_EXP 16384 /* Minimum positive normalized number. */ # undef LDBL_MIN -# define LDBL_MIN 3.3621031431120935E-4932L /* = 0x1p-16382L */ +# define LDBL_MIN 3.362103143112093506262677817321752E-4932L /* = 0x1p-16382L */ /* Maximum representable finite number. */ # undef LDBL_MAX /* LDBL_MAX is represented as { 0xFFFFFFFF, 0xFFFFFFFF, 32766 }. diff --git a/lib/flock.c b/lib/flock.c index 563955e..1925783 100644 --- a/lib/flock.c +++ b/lib/flock.c @@ -1,12 +1,12 @@ /* Emulate flock on platforms that lack it, primarily Windows and MinGW. This is derived from sqlite3 sources. - http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c - http://www.sqlite.org/copyright.html + https://www.sqlite.org/src/finfo?name=src/os_win.c + https://www.sqlite.org/copyright.html Written by Richard W.M. Jones - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -19,7 +19,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include #include @@ -33,7 +33,11 @@ # include /* _get_osfhandle */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif /* Determine the current size of a file. Because the other braindead * APIs we'll call need lower/upper 32 bit pairs, keep the file size diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 709d4ff..0fa0a3d 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2007, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +11,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _LIBC # include @@ -65,6 +65,14 @@ extern int fnmatch (const char *pattern, const char *string, int flags); #include "flexmember.h" +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* We often have to test for FNM_FILE_NAME and FNM_PERIOD being both set. */ #define NO_LEADING_PERIOD(flags) \ ((flags & (FNM_FILE_NAME | FNM_PERIOD)) == (FNM_FILE_NAME | FNM_PERIOD)) diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index 1782ad2..2464449 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2017 Free +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _FNMATCH_H #define _FNMATCH_H 1 diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c index 97a1b9a..dcf5a15 100644 --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2006, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Match STRING against the file name pattern PATTERN, returning zero if it matches, nonzero if not. */ @@ -960,7 +960,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, new_no_leading_period = true; break; } - /* FALLTHROUGH */ + FALLTHROUGH; default: normal_match: if (n == string_end || c != FOLD ((UCHAR) *n)) @@ -1114,8 +1114,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, case L_('*'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('+'): do { @@ -1151,8 +1150,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, case L_('?'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('@'): do /* I cannot believe it but 'strcat' is actually acceptable diff --git a/lib/fopen.c b/lib/fopen.c index 1cefd85..409f54f 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ diff --git a/lib/fseek.c b/lib/fseek.c index d9e2e84..e0b5877 100644 --- a/lib/fseek.c +++ b/lib/fseek.c @@ -1,5 +1,5 @@ /* An fseek() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/fseeko.c b/lib/fseeko.c index 5ae106f..56cdc59 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -1,5 +1,5 @@ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include @@ -80,7 +80,7 @@ fseeko (FILE *fp, off_t offset, int whence) #elif defined __minix /* Minix */ if (fp_->_ptr == fp_->_buf && (fp_->_ptr == NULL || fp_->_count == 0)) -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ if (fp_->_ptr == fp_->_base && (fp_->_ptr == NULL || fp_->_cnt == 0)) #elif defined __UCLIBC__ /* uClibc */ @@ -150,7 +150,7 @@ fseeko (FILE *fp, off_t offset, int whence) fp_->_flags &= ~__SEOF; #elif defined __EMX__ /* emx+gcc */ fp->_flags &= ~_IOEOF; -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ fp_->_flag &= ~_IOEOF; #elif defined __MINT__ /* Atari FreeMiNT */ fp->__offset = pos; diff --git a/lib/fstat.c b/lib/fstat.c index a5aabc5..c143d46 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* If the user's config.h happens to include , let it include only the system's here, so that orig_fstat doesn't recurse to @@ -23,54 +23,41 @@ /* Get the original definition of fstat. It might be defined as a macro. */ #include #include -#if _GL_WINDOWS_64_BIT_ST_SIZE -# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define stat _stati64 -# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define fstat _fstati64 -#endif #undef __need_system_sys_stat_h +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WINDOWS_NATIVE +#endif + +#if !defined WINDOWS_NATIVE + static int orig_fstat (int fd, struct stat *buf) { return fstat (fd, buf); } +#endif + /* Specification. */ /* Write "sys/stat.h" here, not , otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include above. */ #include "sys/stat.h" +#include "stat-time.h" + #include #include - -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER -# include "msvc-inval.h" -#endif - -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static int -fstat_nothrow (int fd, struct stat *buf) -{ - int result; - - TRY_MSVC_INVAL - { - result = orig_fstat (fd, buf); - } - CATCH_MSVC_INVAL - { - result = -1; - errno = EBADF; - } - DONE_MSVC_INVAL; - - return result; -} -#else -# define fstat_nothrow orig_fstat +#ifdef WINDOWS_NATIVE +# define WIN32_LEAN_AND_MEAN +# include +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif +# include "stat-w32.h" #endif int @@ -84,5 +71,20 @@ rpl_fstat (int fd, struct stat *buf) return stat (name, buf); #endif - return fstat_nothrow (fd, buf); +#ifdef WINDOWS_NATIVE + /* Fill the fields ourselves, because the original fstat function returns + values for st_atime, st_mtime, st_ctime that depend on the current time + zone. See + */ + HANDLE h = (HANDLE) _get_osfhandle (fd); + + if (h == INVALID_HANDLE_VALUE) + { + errno = EBADF; + return -1; + } + return _gl_fstat_by_handle (h, NULL, buf); +#else + return stat_time_normalize (orig_fstat (fd, buf), buf); +#endif } diff --git a/lib/ftell.c b/lib/ftell.c index a5c9489..74a1da8 100644 --- a/lib/ftell.c +++ b/lib/ftell.c @@ -1,5 +1,5 @@ /* An ftell() function that works around platform bugs. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/ftello.c b/lib/ftello.c index 298255a..495c254 100644 --- a/lib/ftello.c +++ b/lib/ftello.c @@ -1,5 +1,5 @@ /* An ftello() function that works around platform bugs. - Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/futimens.c b/lib/futimens.c index 213e9b7..abcba9e 100644 --- a/lib/futimens.c +++ b/lib/futimens.c @@ -1,5 +1,5 @@ /* Set the access and modification time of an open fd. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Eric Blake */ diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c index 26b74a7..bc5b599 100644 --- a/lib/gai_strerror.c +++ b/lib/gai_strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2017 Free Software +/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell , 1997. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _LIBC # include diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index e0faec9..a0b638b 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,5 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001-2002, 2004-2017 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2002, 2004-2018 Free Software Foundation, Inc. Contributed by Simon Josefsson . This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc optimizes away the sa == NULL test below. */ @@ -54,7 +54,7 @@ # define PF_UNSPEC 0 #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE #endif diff --git a/lib/getdelim.c b/lib/getdelim.c index e2e0885..09b362e 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -1,5 +1,5 @@ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2017 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Ported from glibc by Simon Josefsson. */ @@ -52,7 +52,7 @@ alloc_failed (void) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* Avoid errno problem without using the realloc module; see: - http://lists.gnu.org/archive/html/bug-gnulib/2016-08/msg00025.html */ + https://lists.gnu.org/r/bug-gnulib/2016-08/msg00025.html */ errno = ENOMEM; #endif } diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index 7fabb51..c6c1136 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -1,5 +1,5 @@ -/* getdtablesize() function for platforms that don't have it. - Copyright (C) 2008-2017 Free Software Foundation, Inc. +/* getdtablesize() function: Return maximum possible file descriptor value + 1. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -24,7 +24,9 @@ # include -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif # if HAVE_MSVC_INVALID_PARAMETER_HANDLER static int @@ -44,7 +46,8 @@ _setmaxstdio_nothrow (int newmax) return result; } -# define _setmaxstdio _setmaxstdio_nothrow +# else +# define _setmaxstdio_nothrow _setmaxstdio # endif /* Cache for the previous getdtablesize () result. Safe to cache because @@ -76,9 +79,9 @@ getdtablesize (void) freed when we call _setmaxstdio with the original value. */ int orig_max_stdio = _getmaxstdio (); unsigned int bound; - for (bound = 0x10000; _setmaxstdio (bound) < 0; bound = bound / 2) + for (bound = 0x10000; _setmaxstdio_nothrow (bound) < 0; bound = bound / 2) ; - _setmaxstdio (orig_max_stdio); + _setmaxstdio_nothrow (orig_max_stdio); dtablesize = bound; } return dtablesize; diff --git a/lib/getgroups.c b/lib/getgroups.c index dce0f2d..ec137c1 100644 --- a/lib/getgroups.c +++ b/lib/getgroups.c @@ -1,6 +1,6 @@ /* provide consistent interface to getgroups for systems that don't allow N==0 - Copyright (C) 1996, 1999, 2003, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1996, 1999, 2003, 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Jim Meyering */ diff --git a/lib/getline.c b/lib/getline.c index 8b7c9f7..59397ea 100644 --- a/lib/getline.c +++ b/lib/getline.c @@ -1,5 +1,5 @@ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Simon Josefsson. */ diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h new file mode 100644 index 0000000..12b5a87 --- /dev/null +++ b/lib/getopt-cdefs.in.h @@ -0,0 +1,67 @@ +/* getopt-on-non-glibc compatibility macros. + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of gnulib. + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with gnulib; if not, see + . */ + +#ifndef _GETOPT_CDEFS_H +#define _GETOPT_CDEFS_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. It does not have a protective #error, because + the guard macro for getopt.h in gnulib is not fixed. */ + +/* getopt-core.h and getopt-ext.h are shared with GNU libc, and expect + a number of the internal macros supplied to GNU libc's headers by + sys/cdefs.h. Provide fallback definitions for all of them. */ +#if @HAVE_SYS_CDEFS_H@ +# include +#endif + +#ifndef __BEGIN_DECLS +# ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# else +# define __BEGIN_DECLS /* nothing */ +# endif +#endif +#ifndef __END_DECLS +# ifdef __cplusplus +# define __END_DECLS } +# else +# define __END_DECLS /* nothing */ +# endif +#endif + +#ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_VERSION__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define __GNUC_PREREQ(maj, min) 0 +# endif +#endif + +#ifndef __THROW +# if defined __cplusplus && __GNUC_PREREQ (2,8) +# define __THROW throw () +# else +# define __THROW +# endif +#endif + +#endif /* _GETOPT_CDEFS_H */ diff --git a/lib/getopt-core.h b/lib/getopt-core.h new file mode 100644 index 0000000..e51b6c7 --- /dev/null +++ b/lib/getopt-core.h @@ -0,0 +1,96 @@ +/* Declarations for getopt (basic, portable features only). + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _GETOPT_CORE_H +#define _GETOPT_CORE_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. Unlike most bits headers, it does not have + a protective #error, because the guard macro for getopt.h in + gnulib is not fixed. */ + +__BEGIN_DECLS + +/* For communication from 'getopt' to the caller. + When 'getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when 'ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to 'getopt'. + + On entry to 'getopt', zero means this is the first call; initialize. + + When 'getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, 'optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message 'getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, 'optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in 'optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU 'getopt'. + + The argument '--' causes premature termination of argument + scanning, explicitly telling 'getopt' that there are no more + options. + + If OPTS begins with '-', then non-option arguments are treated as + arguments to the option '\1'. This behavior is specific to the GNU + 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in + the environment, then do not permute arguments. + + For standards compliance, the 'argv' argument has the type + char *const *, but this is inaccurate; if argument permutation is + enabled, the argv array (not the strings it points to) must be + writable. */ + +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) + __THROW _GL_ARG_NONNULL ((2, 3)); + +__END_DECLS + +#endif /* _GETOPT_CORE_H */ diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h new file mode 100644 index 0000000..cb41206 --- /dev/null +++ b/lib/getopt-ext.h @@ -0,0 +1,77 @@ +/* Declarations for getopt (GNU extensions). + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _GETOPT_EXT_H +#define _GETOPT_EXT_H 1 + +/* This header should not be used directly; include getopt.h instead. + Unlike most bits headers, it does not have a protective #error, + because the guard macro for getopt.h in gnulib is not fixed. */ + +__BEGIN_DECLS + +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of 'struct option' terminated by an element containing a name which is + zero. + + The field 'has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field 'flag' is not NULL, it points to a variable that is set + to the value given in the field 'val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an 'int' to + a compiled-in constant, such as set a value from 'optarg', set the + option's 'flag' field to zero and its 'val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero 'flag' field, 'getopt' + returns the contents of the 'val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the 'has_arg' field of 'struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW _GL_ARG_NONNULL ((2, 3)); +extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW _GL_ARG_NONNULL ((2, 3)); + +__END_DECLS + +#endif /* _GETOPT_EXT_H */ diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h new file mode 100644 index 0000000..c62f9e2 --- /dev/null +++ b/lib/getopt-pfx-core.h @@ -0,0 +1,59 @@ +/* getopt (basic, portable features) gnulib wrapper header. + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of gnulib. + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with gnulib; if not, see + . */ + +#ifndef _GETOPT_PFX_CORE_H +#define _GETOPT_PFX_CORE_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. It does not have a protective #error, because + the guard macro for getopt.h in gnulib is not fixed. */ + +/* Standalone applications should #define __GETOPT_PREFIX to an + identifier that prefixes the external functions and variables + defined in getopt-core.h and getopt-ext.h. Systematically + rename identifiers so that they do not collide with the system + functions and variables. Renaming avoids problems with some + compilers and linkers. */ +#ifdef __GETOPT_PREFIX +# ifndef __GETOPT_ID +# define __GETOPT_CONCAT(x, y) x ## y +# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) +# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) +# endif +# undef getopt +# undef optarg +# undef opterr +# undef optind +# undef optopt +# define getopt __GETOPT_ID (getopt) +# define optarg __GETOPT_ID (optarg) +# define opterr __GETOPT_ID (opterr) +# define optind __GETOPT_ID (optind) +# define optopt __GETOPT_ID (optopt) + +/* The system's getopt.h may have already included getopt-core.h to + declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that + getopt-core.h declares them with prefixes. */ +# undef _GETOPT_CORE_H +#endif + +#include + +#endif /* _GETOPT_PFX_CORE_H */ diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h new file mode 100644 index 0000000..753f129 --- /dev/null +++ b/lib/getopt-pfx-ext.h @@ -0,0 +1,71 @@ +/* getopt (GNU extensions) gnulib wrapper header. + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of gnulib. + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with gnulib; if not, see + . */ + +#ifndef _GETOPT_PFX_EXT_H +#define _GETOPT_PFX_EXT_H 1 + +/* This header should not be used directly; include getopt.h instead. + It does not have a protective #error, because the guard macro for + getopt.h in gnulib is not fixed. */ + +/* Standalone applications should #define __GETOPT_PREFIX to an + identifier that prefixes the external functions and variables + defined in getopt-core.h and getopt-ext.h. Systematically + rename identifiers so that they do not collide with the system + functions and variables. Renaming avoids problems with some + compilers and linkers. */ +#ifdef __GETOPT_PREFIX +# ifndef __GETOPT_ID +# define __GETOPT_CONCAT(x, y) x ## y +# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) +# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) +# endif +# undef getopt_long +# undef getopt_long_only +# undef option +# undef _getopt_internal +# define getopt_long __GETOPT_ID (getopt_long) +# define getopt_long_only __GETOPT_ID (getopt_long_only) +# define option __GETOPT_ID (option) +# define _getopt_internal __GETOPT_ID (getopt_internal) + +/* The system's getopt.h may have already included getopt-ext.h to + declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that + getopt-ext.h declares them with prefixes. */ +# undef _GETOPT_EXT_H +#endif + +/* Standalone applications get correct prototypes for getopt_long and + getopt_long_only; they declare "char **argv". For backward + compatibility with old applications, if __GETOPT_PREFIX is not + defined, we supply GNU-libc-compatible, but incorrect, prototypes + using "char *const *argv". (GNU libc is stuck with the incorrect + prototypes, as they are baked into older versions of LSB.) */ +#ifndef __getopt_argv_const +# if defined __GETOPT_PREFIX +# define __getopt_argv_const /* empty */ +# else +# define __getopt_argv_const const +# endif +#endif + +#include + +#endif /* _GETOPT_PFX_EXT_H */ diff --git a/lib/getopt.c b/lib/getopt.c index e40ea8d..55375cc 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,23 +1,21 @@ /* Getopt for GNU. - NOTE: getopt is part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! - Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2017 Free Software - Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, + Copyright (C) 1987-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ #ifndef _LIBC # include @@ -31,30 +29,54 @@ #include #ifdef _LIBC +/* When used as part of glibc, error printing must be done differently + for standards compliance. getopt is not a cancellation point, so + it must not call functions that are, and it is specified by an + older standard than stdio locking, so it must not refer to + functions in the "user namespace" related to stdio locking. + Finally, it must use glibc's internal message translation so that + the messages are looked up in the proper text domain. */ # include +# define fprintf __fxprintf_nocancel +# define flockfile(fp) _IO_flockfile (fp) +# define funlockfile(fp) _IO_funlockfile (fp) #else # include "gettext.h" # define _(msgid) gettext (msgid) +/* When used standalone, flockfile and funlockfile might not be + available. */ +# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \ + || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) +# define flockfile(fp) /* nop */ +# define funlockfile(fp) /* nop */ +# endif +/* When used standalone, do not attempt to use alloca. */ +# define __libc_use_alloca(size) 0 +# undef alloca +# define alloca(size) (abort (), (void *)0) #endif -#if defined _LIBC && defined USE_IN_LIBIO -# include -#endif - -/* This version of 'getopt' appears to the caller like standard Unix 'getopt' - but it behaves differently for the user, since it allows the user - to intersperse the options with the other arguments. - - As 'getopt_long' works, it permutes the elements of ARGV so that, - when it is done, all the options precede everything else. Thus - all application programs are extended to handle flexible argument order. - - Using 'getopt' or setting the environment variable POSIXLY_CORRECT +/* This implementation of 'getopt' has three modes for handling + options interspersed with non-option arguments. It can stop + scanning for options at the first non-option argument encountered, + as POSIX specifies. It can continue scanning for options after the + first non-option argument, but permute 'argv' as it goes so that, + after 'getopt' is done, all the options precede all the non-option + arguments and 'optind' points to the first non-option argument. + Or, it can report non-option arguments as if they were arguments to + the option character '\x01'. + + The default behavior of 'getopt_long' is to permute the argument list. + When this implementation is used standalone, the default behavior of + 'getopt' is to stop at the first non-option argument, but when it is + used as part of GNU libc it also permutes the argument list. In both + cases, setting the environment variable POSIXLY_CORRECT to any value disables permutation. - Then the behavior is completely standard. - GNU application programs can use a third alternative mode in which - they can distinguish the relative order of options and other arguments. */ + If the first character of the OPTSTRING argument to 'getopt' or + 'getopt_long' is '+', both functions will stop at the first + non-option argument. If it is '-', both functions will report + non-option arguments as arguments to the option character '\x01'. */ #include "getopt_int.h" @@ -95,42 +117,7 @@ int optopt = '?'; /* Keep a global copy of all internal members of getopt_data. */ static struct _getopt_data getopt_data; - - -#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV -extern char *getenv (); -#endif -#ifdef _LIBC -/* Stored original parameters. - XXX This is no good solution. We should rather copy the args so - that we can compare them later. But we must not use malloc(3). */ -extern int __libc_argc; -extern char **__libc_argv; - -/* Bash 2.0 gives us an environment variable containing flags - indicating ARGV elements that should not be considered arguments. */ - -# ifdef USE_NONOPTION_FLAGS -/* Defined in getopt_init.c */ -extern char *__getopt_nonoption_flags; -# endif - -# ifdef USE_NONOPTION_FLAGS -# define SWAP_FLAGS(ch1, ch2) \ - if (d->__nonoption_flags_len > 0) \ - { \ - char __tmp = __getopt_nonoption_flags[ch1]; \ - __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ - __getopt_nonoption_flags[ch2] = __tmp; \ - } -# else -# define SWAP_FLAGS(ch1, ch2) -# endif -#else /* !_LIBC */ -# define SWAP_FLAGS(ch1, ch2) -#endif /* _LIBC */ - /* Exchange two adjacent subsequences of ARGV. One subsequence is elements [first_nonopt,last_nonopt) which contains all the non-options that have been skipped so far. @@ -153,64 +140,40 @@ exchange (char **argv, struct _getopt_data *d) It leaves the longer segment in the right place overall, but it consists of two parts that need to be swapped next. */ -#if defined _LIBC && defined USE_NONOPTION_FLAGS - /* First make sure the handling of the '__getopt_nonoption_flags' - string can work normally. Our top argument must be in the range - of the string. */ - if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) - { - /* We must extend the array. The user plays games with us and - presents new arguments. */ - char *new_str = malloc (top + 1); - if (new_str == NULL) - d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; - else - { - memset (__mempcpy (new_str, __getopt_nonoption_flags, - d->__nonoption_flags_max_len), - '\0', top + 1 - d->__nonoption_flags_max_len); - d->__nonoption_flags_max_len = top + 1; - __getopt_nonoption_flags = new_str; - } - } -#endif - while (top > middle && middle > bottom) { if (top - middle > middle - bottom) - { - /* Bottom segment is the short one. */ - int len = middle - bottom; - register int i; - - /* Swap it with the top part of the top segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[top - (middle - bottom) + i]; - argv[top - (middle - bottom) + i] = tem; - SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); - } - /* Exclude the moved bottom segment from further swapping. */ - top -= len; - } + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } else - { - /* Top segment is the short one. */ - int len = top - middle; - register int i; - - /* Swap it with the bottom part of the bottom segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[middle + i]; - argv[middle + i] = tem; - SWAP_FLAGS (bottom + i, middle + i); - } - /* Exclude the moved top segment from further swapping. */ - bottom += len; - } + { + /* Top segment is the short one. */ + int len = top - middle; + int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } } /* Update records for the slots the non-options now occupy. */ @@ -219,25 +182,216 @@ exchange (char **argv, struct _getopt_data *d) d->__last_nonopt = d->optind; } -/* Initialize the internal data when the first call is made. */ +/* Process the argument starting with d->__nextchar as a long option. + d->optind should *not* have been advanced over this argument. + + If the value returned is -1, it was not actually a long option, the + state is unchanged, and the argument should be processed as a set + of short options (this can only happen when long_only is true). + Otherwise, the option (and its argument, if any) have been consumed + and the return value is the value to return from _getopt_internal_r. */ +static int +process_long_option (int argc, char **argv, const char *optstring, + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, + int print_errors, const char *prefix) +{ + char *nameend; + size_t namelen; + const struct option *p; + const struct option *pfound = NULL; + int n_options; + int option_index; + + for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + namelen = nameend - d->__nextchar; + + /* First look for an exact match, counting the options as a side + effect. */ + for (p = longopts, n_options = 0; p->name; p++, n_options++) + if (!strncmp (p->name, d->__nextchar, namelen) + && namelen == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + option_index = n_options; + break; + } + + if (pfound == NULL) + { + /* Didn't find an exact match, so look for abbreviations. */ + unsigned char *ambig_set = NULL; + int ambig_malloced = 0; + int ambig_fallback = 0; + int indfound = -1; + + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, d->__nextchar, namelen)) + { + if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + { + /* Second or later nonexact match found. */ + if (!ambig_fallback) + { + if (!print_errors) + /* Don't waste effort tracking the ambig set if + we're not going to print it anyway. */ + ambig_fallback = 1; + else if (!ambig_set) + { + if (__libc_use_alloca (n_options)) + ambig_set = alloca (n_options); + else if ((ambig_set = malloc (n_options)) == NULL) + /* Fall back to simpler error message. */ + ambig_fallback = 1; + else + ambig_malloced = 1; + + if (ambig_set) + { + memset (ambig_set, 0, n_options); + ambig_set[indfound] = 1; + } + } + if (ambig_set) + ambig_set[option_index] = 1; + } + } + } + + if (ambig_set || ambig_fallback) + { + if (print_errors) + { + if (ambig_fallback) + fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"), + argv[0], prefix, d->__nextchar); + else + { + flockfile (stderr); + fprintf (stderr, + _("%s: option '%s%s' is ambiguous; possibilities:"), + argv[0], prefix, d->__nextchar); + + for (option_index = 0; option_index < n_options; option_index++) + if (ambig_set[option_index]) + fprintf (stderr, " '%s%s'", + prefix, longopts[option_index].name); + + /* This must use 'fprintf' even though it's only + printing a single character, so that it goes through + __fxprintf_nocancel when compiled as part of glibc. */ + fprintf (stderr, "\n"); + funlockfile (stderr); + } + } + if (ambig_malloced) + free (ambig_set); + d->__nextchar += strlen (d->__nextchar); + d->optind++; + d->optopt = 0; + return '?'; + } + + option_index = indfound; + } + + if (pfound == NULL) + { + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short option, + then it's an error. */ + if (!long_only || argv[d->optind][1] == '-' + || strchr (optstring, *d->__nextchar) == NULL) + { + if (print_errors) + fprintf (stderr, _("%s: unrecognized option '%s%s'\n"), + argv[0], prefix, d->__nextchar); + + d->__nextchar = NULL; + d->optind++; + d->optopt = 0; + return '?'; + } + + /* Otherwise interpret it as a short option. */ + return -1; + } + + /* We have found a matching long option. Consume it. */ + d->optind++; + d->__nextchar = NULL; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + d->optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' doesn't allow an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (d->optind < argc) + d->optarg = argv[d->optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' requires an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; +} + +/* Initialize internal data upon the first call to getopt. */ static const char * _getopt_initialize (int argc _GL_UNUSED, - char **argv _GL_UNUSED, const char *optstring, - struct _getopt_data *d, int posixly_correct) + char **argv _GL_UNUSED, const char *optstring, + struct _getopt_data *d, int posixly_correct) { /* Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the sequence of previously skipped non-option ARGV-elements is empty. */ + if (d->optind == 0) + d->optind = 1; d->__first_nonopt = d->__last_nonopt = d->optind; - d->__nextchar = NULL; - d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); - /* Determine how to handle the ordering of options and nonoptions. */ - if (optstring[0] == '-') { d->__ordering = RETURN_IN_ORDER; @@ -248,41 +402,12 @@ _getopt_initialize (int argc _GL_UNUSED, d->__ordering = REQUIRE_ORDER; ++optstring; } - else if (d->__posixly_correct) + else if (posixly_correct || !!getenv ("POSIXLY_CORRECT")) d->__ordering = REQUIRE_ORDER; else d->__ordering = PERMUTE; -#if defined _LIBC && defined USE_NONOPTION_FLAGS - if (!d->__posixly_correct - && argc == __libc_argc && argv == __libc_argv) - { - if (d->__nonoption_flags_max_len == 0) - { - if (__getopt_nonoption_flags == NULL - || __getopt_nonoption_flags[0] == '\0') - d->__nonoption_flags_max_len = -1; - else - { - const char *orig_str = __getopt_nonoption_flags; - int len = d->__nonoption_flags_max_len = strlen (orig_str); - if (d->__nonoption_flags_max_len < argc) - d->__nonoption_flags_max_len = argc; - __getopt_nonoption_flags = - (char *) malloc (d->__nonoption_flags_max_len); - if (__getopt_nonoption_flags == NULL) - d->__nonoption_flags_max_len = -1; - else - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', d->__nonoption_flags_max_len - len); - } - } - d->__nonoption_flags_len = d->__nonoption_flags_max_len; - } - else - d->__nonoption_flags_len = 0; -#endif - + d->__initialized = 1; return optstring; } @@ -344,8 +469,8 @@ _getopt_initialize (int argc _GL_UNUSED, int _getopt_internal_r (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, - int long_only, struct _getopt_data *d, int posixly_correct) + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, int posixly_correct) { int print_errors = d->opterr; @@ -355,461 +480,129 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, d->optarg = NULL; if (d->optind == 0 || !d->__initialized) - { - if (d->optind == 0) - d->optind = 1; /* Don't scan ARGV[0], the program name. */ - optstring = _getopt_initialize (argc, argv, optstring, d, - posixly_correct); - d->__initialized = 1; - } + optstring = _getopt_initialize (argc, argv, optstring, d, posixly_correct); else if (optstring[0] == '-' || optstring[0] == '+') optstring++; + if (optstring[0] == ':') print_errors = 0; - /* Test whether ARGV[optind] points to a non-option argument. - Either it does not have option syntax, or there is an environment flag - from the shell indicating it is not an option. The later information - is only used when the used in the GNU libc. */ -#if defined _LIBC && defined USE_NONOPTION_FLAGS -# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ - || (d->optind < d->__nonoption_flags_len \ - && __getopt_nonoption_flags[d->optind] == '1')) -#else -# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') -#endif + /* Test whether ARGV[optind] points to a non-option argument. */ +#define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') if (d->__nextchar == NULL || *d->__nextchar == '\0') { /* Advance to the next ARGV-element. */ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been - moved back by the user (who may also have changed the arguments). */ + moved back by the user (who may also have changed the arguments). */ if (d->__last_nonopt > d->optind) - d->__last_nonopt = d->optind; + d->__last_nonopt = d->optind; if (d->__first_nonopt > d->optind) - d->__first_nonopt = d->optind; + d->__first_nonopt = d->optind; if (d->__ordering == PERMUTE) - { - /* If we have just processed some options following some non-options, - exchange them so that the options come first. */ + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ - if (d->__first_nonopt != d->__last_nonopt - && d->__last_nonopt != d->optind) - exchange ((char **) argv, d); - else if (d->__last_nonopt != d->optind) - d->__first_nonopt = d->optind; + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__last_nonopt != d->optind) + d->__first_nonopt = d->optind; - /* Skip any additional non-options - and extend the range of non-options previously skipped. */ + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ - while (d->optind < argc && NONOPTION_P) - d->optind++; - d->__last_nonopt = d->optind; - } + while (d->optind < argc && NONOPTION_P) + d->optind++; + d->__last_nonopt = d->optind; + } /* The special ARGV-element '--' means premature end of options. - Skip it like a null option, - then exchange with previous non-options as if it were an option, - then skip everything else like a non-option. */ + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ if (d->optind != argc && !strcmp (argv[d->optind], "--")) - { - d->optind++; + { + d->optind++; - if (d->__first_nonopt != d->__last_nonopt - && d->__last_nonopt != d->optind) - exchange ((char **) argv, d); - else if (d->__first_nonopt == d->__last_nonopt) - d->__first_nonopt = d->optind; - d->__last_nonopt = argc; + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__first_nonopt == d->__last_nonopt) + d->__first_nonopt = d->optind; + d->__last_nonopt = argc; - d->optind = argc; - } + d->optind = argc; + } /* If we have done all the ARGV-elements, stop the scan - and back over any non-options that we skipped and permuted. */ + and back over any non-options that we skipped and permuted. */ if (d->optind == argc) - { - /* Set the next-arg-index to point at the non-options - that we previously skipped, so the caller will digest them. */ - if (d->__first_nonopt != d->__last_nonopt) - d->optind = d->__first_nonopt; - return -1; - } + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (d->__first_nonopt != d->__last_nonopt) + d->optind = d->__first_nonopt; + return -1; + } /* If we have come to a non-option and did not permute it, - either stop the scan or describe it to the caller and pass it by. */ + either stop the scan or describe it to the caller and pass it by. */ if (NONOPTION_P) - { - if (d->__ordering == REQUIRE_ORDER) - return -1; - d->optarg = argv[d->optind++]; - return 1; - } + { + if (d->__ordering == REQUIRE_ORDER) + return -1; + d->optarg = argv[d->optind++]; + return 1; + } /* We have found another option-ARGV-element. - Skip the initial punctuation. */ - - d->__nextchar = (argv[d->optind] + 1 - + (longopts != NULL && argv[d->optind][1] == '-')); - } - - /* Decode the current option-ARGV-element. */ - - /* Check whether the ARGV-element is a long option. - - If long_only and the ARGV-element has the form "-f", where f is - a valid short option, don't consider it an abbreviated form of - a long option that starts with f. Otherwise there would be no - way to give the -f short option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an abbreviation of - the long option, just like "--fu", and not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - - if (longopts != NULL - && (argv[d->optind][1] == '-' - || (long_only && (argv[d->optind][2] - || !strchr (optstring, argv[d->optind][1]))))) - { - char *nameend; - unsigned int namelen; - const struct option *p; - const struct option *pfound = NULL; - struct option_list - { - const struct option *p; - struct option_list *next; - } *ambig_list = NULL; -#ifdef _LIBC -/* malloc() not used for _LIBC to simplify failure messages. */ -# define free_option_list(l) -#else -# define free_option_list(l) \ - while (l != NULL) \ - { \ - struct option_list *pn = l->next; \ - free (l); \ - l = pn; \ - } -#endif - int exact = 0; - int ambig = 0; - int indfound = -1; - int option_index; - - for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - namelen = nameend - d->__nextchar; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, d->__nextchar, namelen)) - { - if (namelen == (unsigned int) strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (ambig) - ; /* Taking simpler path to handling ambiguities. */ - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - { - /* Second or later nonexact match found. */ -#ifdef _LIBC - struct option_list *newp = alloca (sizeof (*newp)); -#else - struct option_list *newp = malloc (sizeof (*newp)); - if (newp == NULL) - { - free_option_list (ambig_list); - ambig_list = NULL; - ambig = 1; /* Use simpler fallback message. */ - } - else -#endif - { - newp->p = p; - newp->next = ambig_list; - ambig_list = newp; - } - } - } - - if ((ambig || ambig_list) && !exact) - { - if (print_errors && ambig_list) - { - struct option_list first; - first.p = pfound; - first.next = ambig_list; - ambig_list = &first; - -#if defined _LIBC && defined USE_IN_LIBIO - char *buf = NULL; - size_t buflen = 0; - - FILE *fp = open_memstream (&buf, &buflen); - if (fp != NULL) - { - fprintf (fp, - _("%s: option '%s' is ambiguous; possibilities:"), - argv[0], argv[d->optind]); - - do - { - fprintf (fp, " '--%s'", ambig_list->p->name); - ambig_list = ambig_list->next; - } - while (ambig_list != NULL); - - fputc_unlocked ('\n', fp); - - if (__builtin_expect (fclose (fp) != EOF, 1)) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } - } -#else - fprintf (stderr, - _("%s: option '%s' is ambiguous; possibilities:"), - argv[0], argv[d->optind]); - do - { - fprintf (stderr, " '--%s'", ambig_list->p->name); - ambig_list = ambig_list->next; - } - while (ambig_list != NULL); - - fputc ('\n', stderr); -#endif - } - else if (print_errors && ambig) - { - fprintf (stderr, - _("%s: option '%s' is ambiguous\n"), - argv[0], argv[d->optind]); - } - d->__nextchar += strlen (d->__nextchar); - d->optind++; - d->optopt = 0; - free_option_list (ambig_list); - return '?'; - } - - free_option_list (ambig_list); - - if (pfound != NULL) - { - option_index = indfound; - d->optind++; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - d->optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[d->optind - 1][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("\ -%s: option '--%s' doesn't allow an argument\n"), - argv[0], pfound->name); -#else - fprintf (stderr, _("\ -%s: option '--%s' doesn't allow an argument\n"), - argv[0], pfound->name); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("\ -%s: option '%c%s' doesn't allow an argument\n"), - argv[0], argv[d->optind - 1][0], - pfound->name); -#else - fprintf (stderr, _("\ -%s: option '%c%s' doesn't allow an argument\n"), - argv[0], argv[d->optind - 1][0], - pfound->name); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - - d->__nextchar += strlen (d->__nextchar); - - d->optopt = pfound->val; - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (d->optind < argc) - d->optarg = argv[d->optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '--%s' requires an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option '--%s' requires an argument\n"), - argv[0], pfound->name); -#endif - } - d->__nextchar += strlen (d->__nextchar); - d->optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - d->__nextchar += strlen (d->__nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short - option, then it's an error. - Otherwise interpret it as a short option. */ - if (!long_only || argv[d->optind][1] == '-' - || strchr (optstring, *d->__nextchar) == NULL) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[d->optind][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"), - argv[0], d->__nextchar); -#else - fprintf (stderr, _("%s: unrecognized option '--%s'\n"), - argv[0], d->__nextchar); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"), - argv[0], argv[d->optind][0], d->__nextchar); -#else - fprintf (stderr, _("%s: unrecognized option '%c%s'\n"), - argv[0], argv[d->optind][0], d->__nextchar); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - d->__nextchar = (char *) ""; - d->optind++; - d->optopt = 0; - return '?'; - } + Check whether it might be a long option. */ + if (longopts) + { + if (argv[d->optind][1] == '-') + { + /* "--foo" is always a long option. The special option + "--" was handled above. */ + d->__nextchar = argv[d->optind] + 2; + return process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "--"); + } + + /* If long_only and the ARGV-element has the form "-f", + where f is a valid short option, don't consider it an + abbreviated form of a long option that starts with f. + Otherwise there would be no way to give the -f short + option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an + abbreviation of the long option, just like "--fu", and + not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + if (long_only && (argv[d->optind][2] + || !strchr (optstring, argv[d->optind][1]))) + { + int code; + d->__nextchar = argv[d->optind] + 1; + code = process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "-"); + if (code != -1) + return code; + } + } + + /* It is not a long option. Skip the initial punctuation. */ + d->__nextchar = argv[d->optind] + 1; } /* Look at and handle the next short option-character. */ @@ -824,331 +617,83 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, if (temp == NULL || c == ':' || c == ';') { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"), - argv[0], c); -#else - fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); -#endif - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - d->optopt = c; - return '?'; + if (print_errors) + fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); + d->optopt = c; + return '?'; } + /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';') + if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = 0; - int option_index; - - if (longopts == NULL) - goto no_longs; - - /* This is an option that requires an argument. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - d->optind++; - } - else if (d->optind == argc) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); -#endif - } - d->optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - return c; - } - else - /* We already incremented 'd->optind' once; - increment it again when taking next ARGV-elt as argument. */ - d->optarg = argv[d->optind++]; - - /* optarg is now the argument, see if it's in the - table of longopts. */ - - for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; - nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) - { - if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - /* Second or later nonexact match found. */ - ambig = 1; - } - if (ambig && !exact) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), - argv[0], d->optarg) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), - argv[0], d->optarg); -#endif - } - d->__nextchar += strlen (d->__nextchar); - d->optind++; - return '?'; - } - if (pfound != NULL) - { - option_index = indfound; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - d->optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '-W %s' doesn't allow an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("\ -%s: option '-W %s' doesn't allow an argument\n"), - argv[0], pfound->name); -#endif - } - - d->__nextchar += strlen (d->__nextchar); - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (d->optind < argc) - d->optarg = argv[d->optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '-W %s' requires an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("\ -%s: option '-W %s' requires an argument\n"), - argv[0], pfound->name); -#endif - } - d->__nextchar += strlen (d->__nextchar); - return optstring[0] == ':' ? ':' : '?'; - } - } - else - d->optarg = NULL; - d->__nextchar += strlen (d->__nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - no_longs: - d->__nextchar = NULL; - return 'W'; /* Let the application handle it. */ + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + d->optarg = d->__nextchar; + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + d->optarg = argv[d->optind]; + + d->__nextchar = d->optarg; + d->optarg = NULL; + return process_long_option (argc, argv, optstring, longopts, longind, + 0 /* long_only */, d, print_errors, "-W "); } if (temp[1] == ':') { - if (temp[2] == ':') - { - /* This is an option that accepts an argument optionally. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - d->optind++; - } - else - d->optarg = NULL; - d->__nextchar = NULL; - } - else - { - /* This is an option that requires an argument. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - d->optind++; - } - else if (d->optind == argc) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option requires an argument -- '%c'\n"), - argv[0], c) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); -#endif - } - d->optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - } - else - /* We already incremented 'optind' once; - increment it again when taking next ARGV-elt as argument. */ - d->optarg = argv[d->optind++]; - d->__nextchar = NULL; - } + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + d->optind++; + } + else + d->optarg = NULL; + d->__nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + d->optind++; + } + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented 'optind' once; + increment it again when taking next ARGV-elt as argument. */ + d->optarg = argv[d->optind++]; + d->__nextchar = NULL; + } } return c; } @@ -1156,8 +701,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, int _getopt_internal (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, int long_only, - int posixly_correct) + const struct option *longopts, int *longind, int long_only, + int posixly_correct) { int result; @@ -1165,8 +710,8 @@ _getopt_internal (int argc, char **argv, const char *optstring, getopt_data.opterr = opterr; result = _getopt_internal_r (argc, argv, optstring, longopts, - longind, long_only, &getopt_data, - posixly_correct); + longind, long_only, &getopt_data, + posixly_correct); optind = getopt_data.optind; optarg = getopt_data.optarg; @@ -1175,32 +720,23 @@ _getopt_internal (int argc, char **argv, const char *optstring, return result; } -/* glibc gets a LSB-compliant getopt. - Standalone applications get a POSIX-compliant getopt. */ -#if _LIBC -enum { POSIXLY_CORRECT = 0 }; -#else -enum { POSIXLY_CORRECT = 1 }; -#endif - -int -getopt (int argc, char *const *argv, const char *optstring) -{ - return _getopt_internal (argc, (char **) argv, optstring, - (const struct option *) 0, - (int *) 0, - 0, POSIXLY_CORRECT); -} +/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt. + Standalone applications just get a POSIX-compliant getopt. + POSIX and LSB both require these functions to take 'char *const *argv' + even though this is incorrect (because of the permutation). */ +#define GETOPT_ENTRY(NAME, POSIXLY_CORRECT) \ + int \ + NAME (int argc, char *const *argv, const char *optstring) \ + { \ + return _getopt_internal (argc, (char **)argv, optstring, \ + 0, 0, 0, POSIXLY_CORRECT); \ + } #ifdef _LIBC -int -__posix_getopt (int argc, char *const *argv, const char *optstring) -{ - return _getopt_internal (argc, argv, optstring, - (const struct option *) 0, - (int *) 0, - 0, 1); -} +GETOPT_ENTRY(getopt, 0) +GETOPT_ENTRY(__posix_getopt, 1) +#else +GETOPT_ENTRY(getopt, 1) #endif @@ -1221,51 +757,51 @@ main (int argc, char **argv) c = getopt (argc, argv, "abc:d:0123456789"); if (c == -1) - break; + break; switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value '%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } } if (optind < argc) { printf ("non-option ARGV-elements: "); while (optind < argc) - printf ("%s ", argv[optind++]); + printf ("%s ", argv[optind++]); printf ("\n"); } diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 6cbad8e..5fb58dd 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,20 +1,22 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2017 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of gnulib. + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library, which supplies a different version of + this file. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with gnulib; if not, see . */ #ifndef _@GUARD_PREFIX@_GETOPT_H @@ -32,230 +34,28 @@ # undef _GL_SYSTEM_GETOPT #endif -#ifndef _@GUARD_PREFIX@_GETOPT_H - -#ifndef __need_getopt -# define _@GUARD_PREFIX@_GETOPT_H 1 -#endif +#define _@GUARD_PREFIX@_GETOPT_H 1 /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables - defined in this header. When this happens, include the - headers that might declare getopt so that they will not cause - confusion if included after this file (if the system had , - we have already included it). Then systematically rename - identifiers so that they do not collide with the system functions - and variables. Renaming avoids problems with some compilers and - linkers. */ + defined in getopt-core.h and getopt-ext.h. When this happens, + include the headers that might declare getopt so that they will not + cause confusion if included after this file (if the system had + , we have already included it). */ #if defined __GETOPT_PREFIX -# if !defined __need_getopt -# if !@HAVE_GETOPT_H@ -# define __need_system_stdlib_h -# include -# undef __need_system_stdlib_h -# include -# include -# endif -# undef __need_getopt -# endif -# undef __GETOPT_CONCAT -# undef __GETOPT_XCONCAT -# undef __GETOPT_ID -# undef getopt -# undef getopt_long -# undef getopt_long_only -# undef optarg -# undef opterr -# undef optind -# undef optopt -# undef option -# undef _getopt_internal -# define __GETOPT_CONCAT(x, y) x ## y -# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) -# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) -# define getopt __GETOPT_ID (getopt) -# define getopt_long __GETOPT_ID (getopt_long) -# define getopt_long_only __GETOPT_ID (getopt_long_only) -# define optarg __GETOPT_ID (optarg) -# define opterr __GETOPT_ID (opterr) -# define optind __GETOPT_ID (optind) -# define optopt __GETOPT_ID (optopt) -# define option __GETOPT_ID (option) -# define _getopt_internal __GETOPT_ID (getopt_internal) -#endif - -/* Standalone applications get correct prototypes for getopt_long and - getopt_long_only; they declare "char **argv". libc uses prototypes - with "char *const *argv" that are incorrect because getopt_long and - getopt_long_only can permute argv; this is required for backward - compatibility (e.g., for LSB 2.0.1). - - This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt', - but it caused redefinition warnings if both unistd.h and getopt.h were - included, since unistd.h includes getopt.h having previously defined - __need_getopt. - - The only place where __getopt_argv_const is used is in definitions - of getopt_long and getopt_long_only below, but these are visible - only if __need_getopt is not defined, so it is quite safe to rewrite - the conditional as follows: -*/ -#if !defined __need_getopt -# if defined __GETOPT_PREFIX -# define __getopt_argv_const /* empty */ -# else -# define __getopt_argv_const const -# endif -#endif - -/* If __GNU_LIBRARY__ is not already defined, either we are being used - standalone, or this is the first header included in the source file. - If we are being used with glibc, we need to include , but - that does not exist if we are standalone. So: if __GNU_LIBRARY__ is - not defined, include , which will pull in for us - if it's from glibc. (Why ctype.h? It's guaranteed to exist and it - doesn't flood the namespace with stuff the way some other headers do.) */ -#if !defined __GNU_LIBRARY__ -# include -#endif - -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW +# if !@HAVE_GETOPT_H@ +# define __need_system_stdlib_h +# include +# undef __need_system_stdlib_h +# include +# include # endif #endif /* The definition of _GL_ARG_NONNULL is copied here. */ -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from 'getopt' to the caller. - When 'getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when 'ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to 'getopt'. - - On entry to 'getopt', zero means this is the first call; initialize. - - When 'getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, 'optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message 'getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ +#include +#include +#include -extern int optopt; - -#ifndef __need_getopt -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of 'struct option' terminated by an element containing a name which is - zero. - - The field 'has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field 'flag' is not NULL, it points to a variable that is set - to the value given in the field 'val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an 'int' to - a compiled-in constant, such as set a value from 'optarg', set the - option's 'flag' field to zero and its 'val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero 'flag' field, 'getopt' - returns the contents of the 'val' field. */ - -# if !GNULIB_defined_struct_option -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; -# define GNULIB_defined_struct_option 1 -# endif - -/* Names for the values of the 'has_arg' field of 'struct option'. */ - -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -#endif /* need getopt */ - - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, 'optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in 'optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU 'getopt'. - - The argument '--' causes premature termination of argument - scanning, explicitly telling 'getopt' that there are no more - options. - - If OPTS begins with '-', then non-option arguments are treated as - arguments to the option '\1'. This behavior is specific to the GNU - 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in - the environment, then do not permute arguments. */ - -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW _GL_ARG_NONNULL ((2, 3)); - -#ifndef __need_getopt -extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); -extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); - -#endif - -#ifdef __cplusplus -} -#endif - -/* Make sure we later can get all the definitions and declarations. */ -#undef __need_getopt - -#endif /* _@GUARD_PREFIX@_GETOPT_H */ #endif /* _@GUARD_PREFIX@_GETOPT_H */ diff --git a/lib/getopt1.c b/lib/getopt1.c index 4d2e8cb..9c7fff4 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,56 +1,44 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2017 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1987-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ -#ifdef _LIBC -# include -#else +#ifndef _LIBC # include -# include "getopt.h" #endif -#include "getopt_int.h" - -#include -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -#include -#endif - -#ifndef NULL -#define NULL 0 -#endif +#include "getopt.h" +#include "getopt_int.h" int getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, - const struct option *long_options, int *opt_index) + const struct option *long_options, int *opt_index) { return _getopt_internal (argc, (char **) argv, options, long_options, - opt_index, 0, 0); + opt_index, 0, 0); } int _getopt_long_r (int argc, char **argv, const char *options, - const struct option *long_options, int *opt_index, - struct _getopt_data *d) + const struct option *long_options, int *opt_index, + struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 0, d, 0); + 0, d, 0); } /* Like getopt_long, but '-' as well as '--' can indicate a long option. @@ -60,26 +48,27 @@ _getopt_long_r (int argc, char **argv, const char *options, int getopt_long_only (int argc, char *__getopt_argv_const *argv, - const char *options, - const struct option *long_options, int *opt_index) + const char *options, + const struct option *long_options, int *opt_index) { return _getopt_internal (argc, (char **) argv, options, long_options, - opt_index, 1, 0); + opt_index, 1, 0); } int _getopt_long_only_r (int argc, char **argv, const char *options, - const struct option *long_options, int *opt_index, - struct _getopt_data *d) + const struct option *long_options, int *opt_index, + struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 1, d, 0); + 1, d, 0); } #ifdef TEST #include +#include int main (int argc, char **argv) @@ -93,74 +82,74 @@ main (int argc, char **argv) int option_index = 0; static const struct option long_options[] = { - {"add", 1, 0, 0}, - {"append", 0, 0, 0}, - {"delete", 1, 0, 0}, - {"verbose", 0, 0, 0}, - {"create", 0, 0, 0}, - {"file", 1, 0, 0}, - {0, 0, 0, 0} + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} }; c = getopt_long (argc, argv, "abc:d:0123456789", - long_options, &option_index); + long_options, &option_index); if (c == -1) - break; + break; switch (c) - { - case 0: - printf ("option %s", long_options[option_index].name); - if (optarg) - printf (" with arg %s", optarg); - printf ("\n"); - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value '%s'\n", optarg); - break; - - case 'd': - printf ("option d with value '%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } + { + case 0: + printf ("option %s", long_options[option_index].name); + if (optarg) + printf (" with arg %s", optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case 'd': + printf ("option d with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } } if (optind < argc) { printf ("non-option ARGV-elements: "); while (optind < argc) - printf ("%s ", argv[optind++]); + printf ("%s ", argv[optind++]); printf ("\n"); } diff --git a/lib/getopt_int.h b/lib/getopt_int.h index a7ce0e9..b0e9a6d 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,30 +1,31 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2017 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1989-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ #ifndef _GETOPT_INT_H -#define _GETOPT_INT_H 1 +#define _GETOPT_INT_H 1 #include extern int _getopt_internal (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - int __long_only, int __posixly_correct); + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, int __posixly_correct); /* Reentrant versions which can handle parsing multiple argument @@ -32,28 +33,20 @@ extern int _getopt_internal (int ___argc, char **___argv, /* Describe how to deal with options that follow non-option ARGV-elements. - If the caller did not specify anything, - the default is REQUIRE_ORDER if the environment variable - POSIXLY_CORRECT is defined, PERMUTE otherwise. + REQUIRE_ORDER means don't recognize them as options; stop option + processing when the first non-option is seen. This is what POSIX + specifies should happen. - REQUIRE_ORDER means don't recognize them as options; - stop option processing when the first non-option is seen. - This is what Unix does. - This mode of operation is selected by either setting the environment - variable POSIXLY_CORRECT, or using '+' as the first character - of the list of option characters, or by calling getopt. - - PERMUTE is the default. We permute the contents of ARGV as we - scan, so that eventually all the non-options are at the end. - This allows options to be given in any order, even with programs - that were not written to expect this. + PERMUTE means permute the contents of ARGV as we scan, so that + eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written + to expect this. RETURN_IN_ORDER is an option available to programs that were written to expect options and other ARGV-elements in any order and that care about the ordering of the two. We describe each non-option ARGV-element as if it were the argument of an option - with character code 1. Using '-' as the first character of the - list of option characters selects this mode of operation. + with character code 1. The special argument '--' forces an end of option-scanning regardless of the value of 'ordering'. In the case of RETURN_IN_ORDER, only @@ -91,11 +84,6 @@ struct _getopt_data /* See __ord above. */ enum __ord __ordering; - /* If the POSIXLY_CORRECT environment variable is set - or getopt was called. */ - int __posixly_correct; - - /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have @@ -104,32 +92,27 @@ struct _getopt_data int __first_nonopt; int __last_nonopt; - -#if defined _LIBC && defined USE_NONOPTION_FLAGS - int __nonoption_flags_max_len; - int __nonoption_flags_len; -#endif }; /* The initializer is necessary to set OPTIND and OPTERR to their default values and to clear the initialization flag. */ -#define _GETOPT_DATA_INITIALIZER { 1, 1 } +#define _GETOPT_DATA_INITIALIZER { 1, 1 } extern int _getopt_internal_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - int __long_only, struct _getopt_data *__data, - int __posixly_correct); + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, struct _getopt_data *__data, + int __posixly_correct); extern int _getopt_long_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - struct _getopt_data *__data); + const char *__shortopts, + const struct option *__longopts, int *__longind, + struct _getopt_data *__data); extern int _getopt_long_only_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, - int *__longind, - struct _getopt_data *__data); + const char *__shortopts, + const struct option *__longopts, + int *__longind, + struct _getopt_data *__data); #endif /* getopt_int.h */ diff --git a/lib/getpass.c b/lib/getpass.c index 6ae7de5..786fdf2 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _LIBC # include diff --git a/lib/getpass.h b/lib/getpass.h index 71d41e6..7e31aea 100644 --- a/lib/getpass.h +++ b/lib/getpass.h @@ -1,5 +1,5 @@ /* getpass.h -- Read a password of arbitrary length from /dev/tty or stdin. - Copyright (C) 2004, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2018 Free Software Foundation, Inc. Contributed by Simon Josefsson , 2004. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef GETPASS_H # define GETPASS_H diff --git a/lib/getpeername.c b/lib/getpeername.c index a59a98c..6f3eceb 100644 --- a/lib/getpeername.c +++ b/lib/getpeername.c @@ -1,6 +1,6 @@ /* getpeername.c --- wrappers for Windows getpeername function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/getprogname.c b/lib/getprogname.c index 5295484..c824b47 100644 --- a/lib/getprogname.c +++ b/lib/getprogname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2017 Free Software Foundation, Inc. + Copyright (C) 2016-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -64,7 +64,7 @@ getprogname (void) /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ return last_component (program_invocation_name); # elif HAVE_GETEXECNAME /* Solaris */ - /* http://docs.oracle.com/cd/E19253-01/816-5168/6mbb3hrb1/index.html */ + /* https://docs.oracle.com/cd/E19253-01/816-5168/6mbb3hrb1/index.html */ const char *p = getexecname (); if (!p) p = "?"; @@ -74,7 +74,7 @@ getprogname (void) const char *p = __argv && __argv[0] ? __argv[0] : "?"; return last_component (p); # elif HAVE_VAR___PROGNAME /* OpenBSD, QNX */ - /* http://man.openbsd.org/style.9 */ + /* https://man.openbsd.org/style.9 */ /* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */ /* Be careful to declare this only when we absolutely need it (OpenBSD 5.1), rather than when it's available. Otherwise, @@ -85,9 +85,8 @@ getprogname (void) return p && p[0] ? p : "?"; # elif _AIX /* AIX */ /* Idea by Bastien ROUCARIÈS, - http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00095.html - Reference: http:// - ibm.biz/knowctr#ssw_aix_53/com.ibm.aix.basetechref/doc/basetrf1/getprocs.htm + https://lists.gnu.org/r/bug-gnulib/2010-12/msg00095.html + Reference: https://www.ibm.com/support/knowledgecenter/en/ssw_aix_61/com.ibm.aix.basetrf1/getprocs.htm */ static char *p; static int first = 1; @@ -165,7 +164,7 @@ getprogname (void) if (ioctl_ok) { char *name = buf.pr_fname; - char *namesize = sizeof buf.pr_fname; + size_t namesize = sizeof buf.pr_fname; char *namenul = memchr (name, '\0', namesize); size_t namelen = namenul ? namenul - name : namesize; char *namecopy = malloc (namelen + 1); @@ -183,3 +182,10 @@ getprogname (void) } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/getprogname.h b/lib/getprogname.h index 9ab924c..ee6688f 100644 --- a/lib/getprogname.h +++ b/lib/getprogname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2017 Free Software Foundation, Inc. + Copyright (C) 2016-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _GL_GETPROGNAME_H #define _GL_GETPROGNAME_H diff --git a/lib/getsockname.c b/lib/getsockname.c index 32220d4..fc8f6f5 100644 --- a/lib/getsockname.c +++ b/lib/getsockname.c @@ -1,6 +1,6 @@ /* getsockname.c --- wrappers for Windows getsockname function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/gettext.h b/lib/gettext.h index 0465d7a..f2d7458 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,13 +13,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +/* NLS can be disabled through the configure --disable-nls option + or through "#define ENABLE NLS 0" before including this file. */ +#if defined ENABLE_NLS && ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include @@ -184,7 +185,8 @@ npgettext_aux (const char *domain, #include #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) + /* || __STDC_VERSION__ == 199901L + || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ ) # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 #else # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 diff --git a/lib/gettime.c b/lib/gettime.c index 4ae313e..9a4e342 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 18dcbda..3957565 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* written by Jim Meyering */ @@ -24,93 +24,95 @@ #include -#if HAVE_SYS_TIMEB_H -# include +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WINDOWS_NATIVE +# include #endif -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME +#include "localtime-buffer.h" -/* Work around the bug in some systems whereby gettimeofday clobbers - the static buffer that localtime uses for its return value. The - gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has - this problem. The tzset replacement is necessary for at least - Solaris 2.5, 2.5.1, and 2.6. */ - -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. +#ifdef WINDOWS_NATIVE - On the first call, record the address of the static buffer that - localtime uses for its result. */ - -struct tm * -rpl_localtime (time_t const *timep) -{ - struct tm *tm = localtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; -} +/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ +typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); +static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; +static BOOL initialized = FALSE; -/* Same as above, since gmtime and localtime use the same buffer. */ -struct tm * -rpl_gmtime (time_t const *timep) +static void +initialize (void) { - struct tm *tm = gmtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; + HMODULE kernel32 = LoadLibrary ("kernel32.dll"); + if (kernel32 != NULL) + { + GetSystemTimePreciseAsFileTimeFunc = + (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); + } + initialized = TRUE; } -#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) -{ - /* Save and restore the contents of the buffer used for localtime's - result around the call to tzset. */ - struct tm save = *localtime_buffer_addr; - tzset (); - *localtime_buffer_addr = save; -} #endif /* This is a wrapper for gettimeofday. It is used only on systems that lack this function, or whose implementation of this function - causes problems. */ + causes problems. + Work around the bug in some systems whereby gettimeofday clobbers + the static buffer that localtime uses for its return value. The + gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has + this problem. */ int gettimeofday (struct timeval *restrict tv, void *restrict tz) { #undef gettimeofday -#if HAVE_GETTIMEOFDAY -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME +#ifdef WINDOWS_NATIVE + + /* On native Windows, there are two ways to get the current time: + GetSystemTimeAsFileTime + + or + GetSystemTimePreciseAsFileTime + . + GetSystemTimeAsFileTime produces values that jump by increments of + 15.627 milliseconds (!) on average. + Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2 + microseconds. + More discussion on this topic: + . */ + FILETIME current_time; + + if (!initialized) + initialize (); + if (GetSystemTimePreciseAsFileTimeFunc != NULL) + GetSystemTimePreciseAsFileTimeFunc (¤t_time); + else + GetSystemTimeAsFileTime (¤t_time); + + /* Convert from FILETIME to 'struct timeval'. */ + /* FILETIME: */ + ULONGLONG since_1601 = + ((ULONGLONG) current_time.dwHighDateTime << 32) + | (ULONGLONG) current_time.dwLowDateTime; + /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap + years, in total 134774 days. */ + ULONGLONG since_1970 = + since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000; + ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10; + tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000; + tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000; + + return 0; + +#else + +# if HAVE_GETTIMEOFDAY +# if GETTIMEOFDAY_CLOBBERS_LOCALTIME /* Save and restore the contents of the buffer used for localtime's result around the call to gettimeofday. */ struct tm save = *localtime_buffer_addr; -# endif +# endif -# if defined timeval /* 'struct timeval' overridden by gnulib? */ -# undef timeval +# if defined timeval /* 'struct timeval' overridden by gnulib? */ +# undef timeval struct timeval otv; int result = gettimeofday (&otv, (struct timezone *) tz); if (result == 0) @@ -118,25 +120,16 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) tv->tv_sec = otv.tv_sec; tv->tv_usec = otv.tv_usec; } -# else +# else int result = gettimeofday (tv, (struct timezone *) tz); -# endif +# endif -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME +# if GETTIMEOFDAY_CLOBBERS_LOCALTIME *localtime_buffer_addr = save; -# endif +# endif return result; -#else - -# if HAVE__FTIME - - struct _timeb timebuf; - _ftime (&timebuf); - tv->tv_sec = timebuf.time; - tv->tv_usec = timebuf.millitm * 1000; - # else # if !defined OK_TO_USE_1S_CLOCK @@ -146,9 +139,8 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) tv->tv_sec = time (NULL); tv->tv_usec = 0; -# endif - return 0; +# endif #endif } diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h index ccf1fdf..7ac3857 100644 --- a/lib/gl_openssl.h +++ b/lib/gl_openssl.h @@ -1,6 +1,6 @@ /* Wrap openssl crypto hash routines in gnulib interface. -*- coding: utf-8 -*- - Copyright (C) 2013-2017 Free Software Foundation, Inc. + Copyright (C) 2013-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Pádraig Brady */ diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index ca44c23..f166d7c 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Bruno Haible , 2005. Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h, @@ -30,7 +30,7 @@ /* ------------------------- gl_rwlock_t datatype ------------------------- */ -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1)) +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) # ifdef PTHREAD_RWLOCK_INITIALIZER diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index ea7a5b5..34ff109 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Bruno Haible , 2005. Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h, @@ -140,7 +140,9 @@ extern int glthread_in_use (void); # pragma weak pthread_mutexattr_settype # pragma weak pthread_mutexattr_destroy # pragma weak pthread_rwlockattr_init -# pragma weak pthread_rwlockattr_setkind_np +# if __GNU_LIBRARY__ > 1 +# pragma weak pthread_rwlockattr_setkind_np +# endif # pragma weak pthread_rwlockattr_destroy # ifndef pthread_self # pragma weak pthread_self @@ -179,7 +181,7 @@ typedef pthread_mutex_t gl_lock_t; /* ------------------------- gl_rwlock_t datatype ------------------------- */ -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1)) +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) # ifdef PTHREAD_RWLOCK_INITIALIZER diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c index bf2e19c..e8b484a 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Bruno Haible , 2005. */ diff --git a/lib/group-member.c b/lib/group-member.c index 20f8ee8..3747dfe 100644 --- a/lib/group-member.c +++ b/lib/group-member.c @@ -1,6 +1,6 @@ /* group-member.c -- determine whether group id is in calling user's group list - Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2017 Free Software + Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/hard-locale.c b/lib/hard-locale.c index 57ed42b..49bc6ca 100644 --- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -1,6 +1,6 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2017 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/hard-locale.h b/lib/hard-locale.h index ba424af..22eecc5 100644 --- a/lib/hard-locale.h +++ b/lib/hard-locale.h @@ -1,6 +1,6 @@ /* Determine whether a locale is hard. - Copyright (C) 1999, 2003-2004, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef HARD_LOCALE_H_ # define HARD_LOCALE_H_ 1 diff --git a/lib/iconv.in.h b/lib/iconv.in.h index ddaae67..fa8ca1b 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_ICONV_H diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index e5bb9db..4ef8fd4 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -1,6 +1,6 @@ /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* * Copyright (c) 1996-1999 by Internet Software Consortium. diff --git a/lib/intprops.h b/lib/intprops.h index 85ed61f..15e470c 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ @@ -21,13 +21,12 @@ #define _GL_INTPROPS_H #include -#include /* Return a value with the common real type of E and V and the value of V. */ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - . */ + . */ #define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) /* The extra casts in the following macros work around compiler bugs, @@ -80,24 +79,7 @@ /* This include file assumes that signed types are two's complement without padding bits; the above macros have undefined behavior otherwise. If this is a problem for you, please let us know how to fix it for your host. - As a sanity check, test the assumption for some signed types that - bounds. */ -verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); -verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); -verify (TYPE_MINIMUM (short int) == SHRT_MIN); -verify (TYPE_MAXIMUM (short int) == SHRT_MAX); -verify (TYPE_MINIMUM (int) == INT_MIN); -verify (TYPE_MAXIMUM (int) == INT_MAX); -verify (TYPE_MINIMUM (long int) == LONG_MIN); -verify (TYPE_MAXIMUM (long int) == LONG_MAX); -#ifdef LLONG_MAX -verify (TYPE_MINIMUM (long long int) == LLONG_MIN); -verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); -#endif -/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined. */ -#ifdef UINT_WIDTH -verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); -#endif + This assumption is tested by the intprops-tests module. */ /* Does the __typeof__ keyword work? This could be done by 'configure', but for now it's easier to do it by hand. */ @@ -197,7 +179,7 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. See above for restrictions. Avoid && and || as they tickle bugs in Sun C 5.11 2010/08/13 and other compilers; see - . */ + . */ #define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ ((b) < 0 \ ? ((a) < 0 \ @@ -237,7 +219,11 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); : (max) >> (b) < (a)) /* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) +#if 5 <= __GNUC__ && !defined __ICC +# define _GL_HAS_BUILTIN_OVERFLOW 1 +#else +# define _GL_HAS_BUILTIN_OVERFLOW 0 +#endif /* True if __builtin_add_overflow_p (A, B, C) works. */ #define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) @@ -389,10 +375,10 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); (_Generic \ (*(r), \ signed char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ signed char, SCHAR_MIN, SCHAR_MAX), \ short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ short int, SHRT_MIN, SHRT_MAX), \ int: \ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ @@ -406,10 +392,10 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); #else # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ (sizeof *(r) == sizeof (signed char) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ signed char, SCHAR_MIN, SCHAR_MAX) \ : sizeof *(r) == sizeof (short int) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ short int, SHRT_MIN, SHRT_MAX) \ : sizeof *(r) == sizeof (int) \ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ @@ -431,9 +417,8 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); /* Store the low-order bits of A B into *R, where the operation is given by OP. Use the unsigned type UT for calculation to avoid - overflow problems. *R's type is T, with extremal values TMIN and - TMAX. T must be a signed integer type. Return 1 if the result - overflows. */ + overflow problems. *R's type is T, with extrema TMIN and TMAX. + T must be a signed integer type. Return 1 if the result overflows. */ #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ (sizeof ((a) op (b)) < sizeof (t) \ ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ @@ -442,17 +427,27 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); ((overflow (a, b) \ || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ || (tmax) < ((a) op (b))) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) - -/* Return A B, where the operation is given by OP. Use the - unsigned type UT for calculation to avoid overflow problems. - Convert the result to type T without overflow by subtracting TMIN - from large values before converting, and adding it afterwards. - Compilers can optimize all the operations except OP. */ -#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ - (((ut) (a) op (ut) (b)) <= (tmax) \ - ? (t) ((ut) (a) op (ut) (b)) \ - : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) + +/* Return the low-order bits of A B, where the operation is given + by OP. Use the unsigned type UT for calculation to avoid undefined + behavior on signed integer overflow, and convert the result to type T. + UT is at least as wide as T and is no narrower than unsigned int, + T is two's complement, and there is no padding or trap representations. + Assume that converting UT to T yields the low-order bits, as is + done in all known two's-complement C compilers. E.g., see: + https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html + + According to the C standard, converting UT to T yields an + implementation-defined result or signal for values outside T's + range. However, code that works around this theoretical problem + runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: + https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html + As the compiler bug is real, don't try to work around the + theoretical problem. */ + +#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ + ((t) ((ut) (a) op (ut) (b))) #endif /* _GL_INTPROPS_H */ diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 69b12a8..ca3cec5 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2017 Free Software Foundation, Inc. +/* Copyright (C) 2006-2018 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* * ISO C 99 for platforms that lack it. diff --git a/lib/ioctl.c b/lib/ioctl.c index a28a3ae..140c7b6 100644 --- a/lib/ioctl.c +++ b/lib/ioctl.c @@ -1,6 +1,6 @@ /* ioctl.c --- wrappers for Windows ioctl function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ @@ -52,7 +52,11 @@ rpl_ioctl (int fd, int request, ... /* {void *,char *} arg */) # include "fd-hook.h" /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif static int primary_ioctl (int fd, int request, void *arg) diff --git a/lib/iswblank.c b/lib/iswblank.c index 14f4595..bdd86cb 100644 --- a/lib/iswblank.c +++ b/lib/iswblank.c @@ -1,5 +1,5 @@ /* Test wide character for being blank. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/itold.c b/lib/itold.c index 9eb9507..6a43bd8 100644 --- a/lib/itold.c +++ b/lib/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index 7981cbf..a2f95a9 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* * POSIX for platforms that lack it or have an incomplete one. diff --git a/lib/limits.in.h b/lib/limits.in.h index a7e307f..2c809d9 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright 2016-2017 Free Software Foundation, Inc. + Copyright 2016-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_LIMITS_H @@ -28,6 +28,17 @@ #ifndef _@GUARD_PREFIX@_LIMITS_H #define _@GUARD_PREFIX@_LIMITS_H +/* For HP-UX 11.31. */ +#if defined LONG_LONG_MIN && !defined LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#if defined LONG_LONG_MAX && !defined LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#if defined ULONG_LONG_MAX && !defined ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + /* The number of usable bits in an unsigned or signed integer type with minimum value MIN and maximum value MAX, as an int expression suitable in #if. Cover all known practical hosts. This diff --git a/lib/link.c b/lib/link.c index e821e2d..8212723 100644 --- a/lib/link.c +++ b/lib/link.c @@ -1,6 +1,6 @@ /* Emulate link on platforms that lack it, namely native Windows platforms. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/listen.c b/lib/listen.c index 81936f0..00627f6 100644 --- a/lib/listen.c +++ b/lib/listen.c @@ -1,6 +1,6 @@ /* listen.c --- wrappers for Windows listen function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/localcharset.c b/lib/localcharset.c index 9d0a1b8..d583d6b 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* Written by Bruno Haible . */ @@ -32,7 +32,7 @@ # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE # include #endif @@ -75,6 +75,7 @@ # include "relocatable.h" #else # define relocate(pathname) (pathname) +# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname)) #endif /* Get LIBDIR. */ @@ -129,6 +130,7 @@ get_charset_aliases (void) if (cp == NULL) { #if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) + char *malloc_dir = NULL; const char *dir; const char *base = "charset.alias"; char *file_name; @@ -137,7 +139,7 @@ get_charset_aliases (void) necessary for running the testsuite before "make install". */ dir = getenv ("CHARSETALIASDIR"); if (dir == NULL || dir[0] == '\0') - dir = relocate (LIBDIR); + dir = relocate2 (LIBDIR, &malloc_dir); /* Concatenate dir and base into freshly allocated file_name. */ { @@ -154,6 +156,8 @@ get_charset_aliases (void) } } + free (malloc_dir); + if (file_name == NULL) /* Out of memory. Treat the file as empty. */ cp = ""; @@ -351,7 +355,7 @@ get_charset_aliases (void) by Alex Taylor: . See also "IBM Globalization - Code page identifiers": - . */ + . */ cp = "CP813" "\0" "ISO-8859-7" "\0" "CP878" "\0" "KOI8-R" "\0" "CP819" "\0" "ISO-8859-1" "\0" diff --git a/lib/localcharset.h b/lib/localcharset.h index a2e2a7b..3ce8b94 100644 --- a/lib/localcharset.h +++ b/lib/localcharset.h @@ -1,5 +1,5 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _LOCALCHARSET_H #define _LOCALCHARSET_H diff --git a/lib/locale.in.h b/lib/locale.in.h index 9eb43f9..1b27f1f 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ diff --git a/lib/localeconv.c b/lib/localeconv.c index bc1960b..87cface 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2017 Free Software Foundation, Inc. + Copyright (C) 2012-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/localtime-buffer.c b/lib/localtime-buffer.c new file mode 100644 index 0000000..df11f43 --- /dev/null +++ b/lib/localtime-buffer.c @@ -0,0 +1,58 @@ +/* Provide access to the last buffer returned by localtime() or gmtime(). + + Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +/* written by Jim Meyering */ + +#include + +/* Specification. */ +#include "localtime-buffer.h" + +#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME + +static struct tm tm_zero_buffer; +struct tm *localtime_buffer_addr = &tm_zero_buffer; + +/* This is a wrapper for localtime. + + On the first call, record the address of the static buffer that + localtime uses for its result. */ + +struct tm * +rpl_localtime (time_t const *timep) +{ + struct tm *tm = localtime (timep); + + if (localtime_buffer_addr == &tm_zero_buffer) + localtime_buffer_addr = tm; + + return tm; +} + +/* Same as above, since gmtime and localtime use the same buffer. */ +struct tm * +rpl_gmtime (time_t const *timep) +{ + struct tm *tm = gmtime (timep); + + if (localtime_buffer_addr == &tm_zero_buffer) + localtime_buffer_addr = tm; + + return tm; +} + +#endif diff --git a/lib/localtime-buffer.h b/lib/localtime-buffer.h new file mode 100644 index 0000000..f381ff0 --- /dev/null +++ b/lib/localtime-buffer.h @@ -0,0 +1,27 @@ +/* Provide access to the last buffer returned by localtime() or gmtime(). + + Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +/* written by Jim Meyering */ + +#include + +#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME + +/* The address of the last buffer returned by localtime() or gmtime(). */ +extern struct tm *localtime_buffer_addr; + +#endif diff --git a/lib/lseek.c b/lib/lseek.c index 3b2fdf2..e37aadf 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include @@ -24,7 +24,11 @@ /* Get GetFileType. */ # include /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif #else # include #endif diff --git a/lib/lstat.c b/lib/lstat.c index f4dc43e..5873bbd 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -1,6 +1,6 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Jim Meyering */ @@ -47,6 +47,8 @@ orig_lstat (const char *filename, struct stat *buf) above. */ # include "sys/stat.h" +# include "stat-time.h" + # include # include @@ -66,32 +68,33 @@ orig_lstat (const char *filename, struct stat *buf) int rpl_lstat (const char *file, struct stat *sbuf) { - size_t len; - int lstat_result = orig_lstat (file, sbuf); - - if (lstat_result != 0) - return lstat_result; + int result = orig_lstat (file, sbuf); /* This replacement file can blindly check against '/' rather than using the ISSLASH macro, because all platforms with '\\' either lack symlinks (mingw) or have working lstat (cygwin) and thus do not compile this file. 0 len should have already been filtered out above, with a failure return of ENOENT. */ - len = strlen (file); - if (file[len - 1] != '/' || S_ISDIR (sbuf->st_mode)) - return 0; - - /* At this point, a trailing slash is only permitted on - symlink-to-dir; but it should have found information on the - directory, not the symlink. Call stat() to get info about the - link's referent. Our replacement stat guarantees valid results, - even if the symlink is not pointing to a directory. */ - if (!S_ISLNK (sbuf->st_mode)) + if (result == 0) { - errno = ENOTDIR; - return -1; + if (S_ISDIR (sbuf->st_mode) || file[strlen (file) - 1] != '/') + result = stat_time_normalize (result, sbuf); + else + { + /* At this point, a trailing slash is permitted only on + symlink-to-dir; but it should have found information on the + directory, not the symlink. Call 'stat' to get info about the + link's referent. Our replacement stat guarantees valid results, + even if the symlink is not pointing to a directory. */ + if (!S_ISLNK (sbuf->st_mode)) + { + errno = ENOTDIR; + return -1; + } + result = stat (file, sbuf); + } } - return stat (file, sbuf); + return result; } #endif /* HAVE_LSTAT */ diff --git a/lib/malloc.c b/lib/malloc.c index eeaf12b..471c3ab 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* written by Jim Meyering and Bruno Haible */ diff --git a/lib/malloca.c b/lib/malloca.c new file mode 100644 index 0000000..ebf7a4c --- /dev/null +++ b/lib/malloca.c @@ -0,0 +1,159 @@ +/* Safe automatic memory allocation. + Copyright (C) 2003, 2006-2007, 2009-2018 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#define _GL_USE_STDLIB_ALLOC 1 +#include + +/* Specification. */ +#include "malloca.h" + +#include + +#include "verify.h" + +/* Silence a warning from clang's MemorySanitizer. */ +#if defined __has_feature +# if __has_feature(memory_sanitizer) +# define NO_SANITIZE_MEMORY __attribute__((no_sanitize("memory"))) +# endif +#endif +#ifndef NO_SANITIZE_MEMORY +# define NO_SANITIZE_MEMORY +#endif + +/* The speed critical point in this file is freea() applied to an alloca() + result: it must be fast, to match the speed of alloca(). The speed of + mmalloca() and freea() in the other case are not critical, because they + are only invoked for big memory sizes. */ + +#if HAVE_ALLOCA + +/* Store the mmalloca() results in a hash table. This is needed to reliably + distinguish a mmalloca() result and an alloca() result. + + Although it is possible that the same pointer is returned by alloca() and + by mmalloca() at different times in the same application, it does not lead + to a bug in freea(), because: + - Before a pointer returned by alloca() can point into malloc()ed memory, + the function must return, and once this has happened the programmer must + not call freea() on it anyway. + - Before a pointer returned by mmalloca() can point into the stack, it + must be freed. The only function that can free it is freea(), and + when freea() frees it, it also removes it from the hash table. */ + +#define MAGIC_NUMBER 0x1415fb4a +#define MAGIC_SIZE sizeof (int) +/* This is how the header info would look like without any alignment + considerations. */ +struct preliminary_header { void *next; int magic; }; +/* But the header's size must be a multiple of sa_alignment_max. */ +#define HEADER_SIZE \ + (((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max) +union header { + void *next; + struct { + char room[HEADER_SIZE - MAGIC_SIZE]; + int word; + } magic; +}; +verify (HEADER_SIZE == sizeof (union header)); +/* We make the hash table quite big, so that during lookups the probability + of empty hash buckets is quite high. There is no need to make the hash + table resizable, because when the hash table gets filled so much that the + lookup becomes slow, it means that the application has memory leaks. */ +#define HASH_TABLE_SIZE 257 +static void * mmalloca_results[HASH_TABLE_SIZE]; + +#endif + +void * +mmalloca (size_t n) +{ +#if HAVE_ALLOCA + /* Allocate one more word, that serves as an indicator for malloc()ed + memory, so that freea() of an alloca() result is fast. */ + size_t nplus = n + HEADER_SIZE; + + if (nplus >= n) + { + void *p = malloc (nplus); + + if (p != NULL) + { + size_t slot; + union header *h = p; + + p = h + 1; + + /* Put a magic number into the indicator word. */ + h->magic.word = MAGIC_NUMBER; + + /* Enter p into the hash table. */ + slot = (uintptr_t) p % HASH_TABLE_SIZE; + h->next = mmalloca_results[slot]; + mmalloca_results[slot] = p; + + return p; + } + } + /* Out of memory. */ + return NULL; +#else +# if !MALLOC_0_IS_NONNULL + if (n == 0) + n = 1; +# endif + return malloc (n); +#endif +} + +#if HAVE_ALLOCA +void NO_SANITIZE_MEMORY +freea (void *p) +{ + /* mmalloca() may have returned NULL. */ + if (p != NULL) + { + /* Attempt to quickly distinguish the mmalloca() result - which has + a magic indicator word - and the alloca() result - which has an + uninitialized indicator word. It is for this test that sa_increment + additional bytes are allocated in the alloca() case. */ + if (((int *) p)[-1] == MAGIC_NUMBER) + { + /* Looks like a mmalloca() result. To see whether it really is one, + perform a lookup in the hash table. */ + size_t slot = (uintptr_t) p % HASH_TABLE_SIZE; + void **chain = &mmalloca_results[slot]; + for (; *chain != NULL;) + { + union header *h = p; + if (*chain == p) + { + /* Found it. Remove it from the hash table and free it. */ + union header *p_begin = h - 1; + *chain = p_begin->next; + free (p_begin); + return; + } + h = *chain; + chain = &h[-1].next; + } + } + /* At this point, we know it was not a mmalloca() result. */ + } +} +#endif diff --git a/lib/malloca.h b/lib/malloca.h new file mode 100644 index 0000000..499e822 --- /dev/null +++ b/lib/malloca.h @@ -0,0 +1,128 @@ +/* Safe automatic memory allocation. + Copyright (C) 2003-2007, 2009-2018 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#ifndef _MALLOCA_H +#define _MALLOCA_H + +#include +#include +#include +#include + +#include "xalloc-oversized.h" + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* safe_alloca(N) is equivalent to alloca(N) when it is safe to call + alloca(N); otherwise it returns NULL. It either returns N bytes of + memory allocated on the stack, that lasts until the function returns, + or NULL. + Use of safe_alloca should be avoided: + - inside arguments of function calls - undefined behaviour, + - in inline functions - the allocation may actually last until the + calling function returns. +*/ +#if HAVE_ALLOCA +/* The OS usually guarantees only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + allocate anything larger than 4096 bytes. Also care for the possibility + of a few compiler-allocated temporary stack slots. + This must be a macro, not a function. */ +# define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL) +#else +# define safe_alloca(N) ((void) (N), NULL) +#endif + +/* malloca(N) is a safe variant of alloca(N). It allocates N bytes of + memory allocated on the stack, that must be freed using freea() before + the function returns. Upon failure, it returns NULL. */ +#if HAVE_ALLOCA +# define malloca(N) \ + ((N) < 4032 - sa_increment \ + ? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \ + : mmalloca (N)) +#else +# define malloca(N) \ + mmalloca (N) +#endif +extern void * mmalloca (size_t n); + +/* Free a block of memory allocated through malloca(). */ +#if HAVE_ALLOCA +extern void freea (void *p); +#else +# define freea free +#endif + +/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). + It allocates an array of N objects, each with S bytes of memory, + on the stack. S must be positive and N must be nonnegative. + The array must be freed using freea() before the function returns. */ +#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) + + +#ifdef __cplusplus +} +#endif + + +/* ------------------- Auxiliary, non-public definitions ------------------- */ + +/* Determine the alignment of a type at compile time. */ +#if defined __GNUC__ || defined __IBM__ALIGNOF__ +# define sa_alignof __alignof__ +#elif defined __cplusplus + template struct sa_alignof_helper { char __slot1; type __slot2; }; +# define sa_alignof(type) offsetof (sa_alignof_helper, __slot2) +#elif defined __hpux + /* Work around a HP-UX 10.20 cc bug with enums constants defined as offsetof + values. */ +# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8) +#elif defined _AIX + /* Work around an AIX 3.2.5 xlc bug with enums constants defined as offsetof + values. */ +# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8) +#else +# define sa_alignof(type) offsetof (struct { char __slot1; type __slot2; }, __slot2) +#endif + +enum +{ +/* The desired alignment of memory allocations is the maximum alignment + among all elementary types. */ + sa_alignment_long = sa_alignof (long), + sa_alignment_double = sa_alignof (double), +#if HAVE_LONG_LONG_INT + sa_alignment_longlong = sa_alignof (long long), +#endif + sa_alignment_longdouble = sa_alignof (long double), + sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1) +#if HAVE_LONG_LONG_INT + | (sa_alignment_longlong - 1) +#endif + | (sa_alignment_longdouble - 1) + ) + 1, +/* The increment that guarantees room for a magic word must be >= sizeof (int) + and a multiple of sa_alignment_max. */ + sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max +}; + +#endif /* _MALLOCA_H */ diff --git a/lib/malloca.valgrind b/lib/malloca.valgrind new file mode 100644 index 0000000..52f0a50 --- /dev/null +++ b/lib/malloca.valgrind @@ -0,0 +1,7 @@ +# Suppress a valgrind message about use of uninitialized memory in freea(). +# This use is OK because it provides only a speedup. +{ + freea + Memcheck:Cond + fun:freea +} diff --git a/lib/mbchar.c b/lib/mbchar.c index 69675bf..6d2a47e 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +11,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/mbchar.h b/lib/mbchar.h index ec24068..55c07e3 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -1,5 +1,5 @@ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible . */ diff --git a/lib/mbiter.h b/lib/mbiter.h index c3e6f76..49e50a3 100644 --- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible . */ diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index d4809f6..22ac2c4 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -35,6 +35,13 @@ # include "streq.h" # include "verify.h" +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif verify (sizeof (mbstate_t) >= 4); @@ -74,10 +81,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) break; case 3: buf[2] = pstate[3]; - /*FALLTHROUGH*/ + FALLTHROUGH; case 2: buf[1] = pstate[2]; - /*FALLTHROUGH*/ + FALLTHROUGH; case 1: buf[0] = pstate[1]; p = buf; @@ -98,7 +105,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) /* Here m > 0. */ # if __GLIBC__ || defined __UCLIBC__ - /* Work around bug */ + /* Work around bug */ mbtowc (NULL, NULL, 0); # endif { diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 58e0441..921cbf1 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -22,17 +22,7 @@ #include "verify.h" -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - -/* On native Windows, 'mbstate_t' is defined as 'int'. */ - -int -mbsinit (const mbstate_t *ps) -{ - return ps == NULL || *ps == 0; -} - -#else +#if GNULIB_defined_mbstate_t /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs() and wcrtomb(), wcsrtombs(). @@ -45,6 +35,7 @@ mbsinit (const mbstate_t *ps) 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. + See mbrtowc.c. - In wc -> mb direction, mbstate_t contains no information. In other words, it is always in the initial state. */ @@ -58,4 +49,25 @@ mbsinit (const mbstate_t *ps) return pstate == NULL || pstate[0] == 0; } +#else + +int +mbsinit (const mbstate_t *ps) +{ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* Native Windows. */ +# ifdef __MINGW32__ + /* On mingw, 'mbstate_t' is defined as 'int'. */ + return ps == NULL || *ps == 0; +# else + /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4-bytes matter. */ + return ps == NULL || *(const unsigned int *)ps == 0; +# endif +# else + /* Minix, HP-UX 11.00, Solaris 2.6, Interix, ... */ + /* Maybe this definition works, maybe not... */ + return ps == NULL || *(const char *)ps == 0; +# endif +} + #endif diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h index d787c07..2588a88 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ size_t mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c index 4c213e4..2ab2618 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -23,7 +23,7 @@ mbstate_t _gl_mbsrtowcs_state /* The state must initially be in the "initial state"; so, zero-initialize it. On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3, - see . + see . When it needs an initializer, use 0 or {0} as initializer? 0 only works when mbstate_t is a scalar type (such as when gnulib defines it, or on AIX, IRIX, mingw). {0} works as an initializer in all cases: for a struct diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index 7896e94..1da1ce5 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index b53b2eb..633832f 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* We don't need a static internal state, because the encoding is not state dependent, and when mbrtowc returns (size_t)(-2). we throw the result diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 118754f..a212b22 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/md2.c b/lib/md2.c index 2a6e877..eb86ef8 100644 --- a/lib/md2.c +++ b/lib/md2.c @@ -1,6 +1,6 @@ /* Functions to compute MD2 message digest of files or memory blocks. according to the definition of MD2 in RFC 1319 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2017 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Adapted by Simon Josefsson from public domain Libtomcrypt 1.06 by Tom St Denis. */ diff --git a/lib/md2.h b/lib/md2.h index 262f2f6..fd0a3b3 100644 --- a/lib/md2.h +++ b/lib/md2.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for MD2 sum library functions. - Copyright (C) 2000-2001, 2003, 2005, 2008-2017 Free Software Foundation, + Copyright (C) 2000-2001, 2003, 2005, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef MD2_H # define MD2_H 1 diff --git a/lib/md4.c b/lib/md4.c index 05855f6..3d624e0 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -1,6 +1,6 @@ /* Functions to compute MD4 message digest of files or memory blocks. according to the definition of MD4 in RFC 1320 from April 1992. - Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2017 Free Software + Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Adapted by Simon Josefsson from gnulib md5.? and Libgcrypt cipher/md4.c . */ diff --git a/lib/md4.h b/lib/md4.h index 3781a2c..511b247 100644 --- a/lib/md4.h +++ b/lib/md4.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for MD4 sum library functions. - Copyright (C) 2000-2001, 2003, 2005, 2008-2017 Free Software Foundation, + Copyright (C) 2000-2001, 2003, 2005, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef MD4_H # define MD4_H 1 diff --git a/lib/md5.c b/lib/md5.c index e82b051..9dc915e 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -1,6 +1,6 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2017 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Ulrich Drepper , 1995. */ @@ -246,7 +246,8 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx); ctx->buflen &= 63; - /* The regions in the following copy operation cannot overlap. */ + /* The regions in the following copy operation cannot overlap, + because ctx->buflen < 64 ≤ (left_over + add) & ~63. */ memcpy (ctx->buffer, &((char *) ctx->buffer)[(left_over + add) & ~63], ctx->buflen); @@ -288,6 +289,8 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) { md5_process_block (ctx->buffer, 64, ctx); left_over -= 64; + /* The regions in the following copy operation cannot overlap, + because left_over ≤ 64. */ memcpy (ctx->buffer, &ctx->buffer[16], left_over); } ctx->buflen = left_over; @@ -466,3 +469,10 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx) ctx->D = D; } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/md5.h b/lib/md5.h index fb20b7b..d89f819 100644 --- a/lib/md5.h +++ b/lib/md5.h @@ -1,6 +1,6 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2017 Free Software + Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _MD5_H #define _MD5_H 1 @@ -74,8 +74,8 @@ struct md5_ctx uint32_t D; uint32_t total[2]; - uint32_t buflen; - uint32_t buffer[32]; + uint32_t buflen; /* ≥ 0, ≤ 128 */ + uint32_t buffer[32]; /* 128 bytes; the first buflen bytes are in use */ }; /* @@ -133,3 +133,10 @@ extern int __md5_stream (FILE *stream, void *resblock) __THROW; # endif #endif /* md5.h */ + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/memchr.c b/lib/memchr.c index 3481260..0b47546 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2018 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), @@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . */ +along with this program. If not, see . */ #ifndef _LIBC # include diff --git a/lib/memrchr.c b/lib/memrchr.c index fefe16c..99acfd9 100644 --- a/lib/memrchr.c +++ b/lib/memrchr.c @@ -1,6 +1,6 @@ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2017 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2018 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), @@ -20,7 +20,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if defined _LIBC # include diff --git a/lib/minmax.h b/lib/minmax.h index 6b602a9..33a5305 100644 --- a/lib/minmax.h +++ b/lib/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2017 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _MINMAX_H #define _MINMAX_H diff --git a/lib/mkdir.c b/lib/mkdir.c index 0930974..e993954 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -1,7 +1,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003, 2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Jim Meyering */ diff --git a/lib/mkostemp.c b/lib/mkostemp.c index 56c22a4..df9ecf8 100644 --- a/lib/mkostemp.c +++ b/lib/mkostemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2017 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2018 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if !_LIBC # include diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 8083e18..02a7b65 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2017 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2018 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if !_LIBC # include diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h index 6c8b2e7..92bdda6 100644 --- a/lib/mktime-internal.h +++ b/lib/mktime-internal.h @@ -1,6 +1,6 @@ /* mktime variant that also uses an offset guess - Copyright 2016-2017 Free Software Foundation, Inc. + Copyright 2016-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, see - . */ + . */ #include diff --git a/lib/mktime.c b/lib/mktime.c index 998882f..007adf1 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2017 Free Software Foundation, Inc. + Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert . @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ /* Define this to 1 to have a standalone program to test this implementation of mktime. */ @@ -23,6 +23,19 @@ # define DEBUG_MKTIME 0 #endif +/* The following macros influence what gets defined when this file is compiled: + + Macro/expression Which gnulib module This compilation unit + should define + + NEED_MKTIME_WORKING mktime rpl_mktime + || NEED_MKTIME_WINDOWS + + NEED_MKTIME_INTERNAL mktime-internal mktime_internal + + DEBUG_MKTIME (defined manually) my_mktime, main + */ + #if !defined _LIBC && !DEBUG_MKTIME # include #endif @@ -51,6 +64,13 @@ # define mktime my_mktime #endif +#if NEED_MKTIME_WINDOWS /* on native Windows */ +# include +# include +#endif + +#if NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME + /* A signed type that can represent an integer number of years multiplied by three times the number of seconds in a year. It is needed when converting a tm_year value times the number of seconds @@ -458,25 +478,65 @@ __mktime_internal (struct tm *tp, return t; } +#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME */ + +#if NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME +# if NEED_MKTIME_WORKING || DEBUG_MKTIME static mktime_offset_t localtime_offset; +# endif /* Convert *TP to a time_t value. */ time_t mktime (struct tm *tp) { -#ifdef _LIBC +# if NEED_MKTIME_WINDOWS + /* Rectify the value of the environment variable TZ. + There are four possible kinds of such values: + - Traditional US time zone names, e.g. "PST8PDT". Syntax: see + + - Time zone names based on geography, that contain one or more + slashes, e.g. "Europe/Moscow". + - Time zone names based on geography, without slashes, e.g. + "Singapore". + - Time zone names that contain explicit DST rules. Syntax: see + + The Microsoft CRT understands only the first kind. It produces incorrect + results if the value of TZ is of the other kinds. + But in a Cygwin environment, /etc/profile.d/tzset.sh sets TZ to a value + of the second kind for most geographies, or of the first kind in a few + other geographies. If it is of the second kind, neutralize it. For the + Microsoft CRT, an absent or empty TZ means the time zone that the user + has set in the Windows Control Panel. + If the value of TZ is of the third or fourth kind -- Cygwin programs + understand these syntaxes as well --, it does not matter whether we + neutralize it or not, since these values occur only when a Cygwin user + has set TZ explicitly; this case is 1. rare and 2. under the user's + responsibility. */ + const char *tz = getenv ("TZ"); + if (tz != NULL && strchr (tz, '/') != NULL) + _putenv ("TZ="); +# endif + +# if NEED_MKTIME_WORKING || DEBUG_MKTIME +# ifdef _LIBC /* POSIX.1 8.1.1 requires that whenever mktime() is called, the time zone names contained in the external variable 'tzname' shall be set as if the tzset() function had been called. */ __tzset (); -#elif HAVE_TZSET +# elif HAVE_TZSET tzset (); -#endif +# endif return __mktime_internal (tp, __localtime_r, &localtime_offset); +# else +# undef mktime + return mktime (tp); +# endif } +#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME */ + #ifdef weak_alias weak_alias (mktime, timelocal) #endif diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index 7139e93..0f19a09 100644 --- a/lib/msvc-inval.c +++ b/lib/msvc-inval.c @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h index 6e216d6..8e7ff30 100644 --- a/lib/msvc-inval.h +++ b/lib/msvc-inval.h @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _MSVC_INVAL_H #define _MSVC_INVAL_H @@ -95,7 +95,7 @@ extern void gl_msvc_inval_ensure_handler (void); /* Gnulib can define its own status codes, as described in the page "Raising Software Exceptions" on microsoft.com - . + . Our status codes are composed of - 0xE0000000, mandatory for all user-defined status codes, - 0x474E550, a API identifier ("GNU"), @@ -106,7 +106,7 @@ extern void gl_msvc_inval_ensure_handler (void); # if defined _MSC_VER /* A compiler that supports __try/__except, as described in the page "try-except statement" on microsoft.com - . + . With __try/__except, we can use the multithread-safe exception handling. */ # ifdef __cplusplus diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index d127eb4..785733e 100644 --- a/lib/msvc-nothrow.c +++ b/lib/msvc-nothrow.c @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include @@ -24,7 +24,9 @@ #define WIN32_LEAN_AND_MEAN #include -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #undef _get_osfhandle diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h index c70efc7..f7a7f8a 100644 --- a/lib/msvc-nothrow.h +++ b/lib/msvc-nothrow.h @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _MSVC_NOTHROW_H #define _MSVC_NOTHROW_H diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 4f65802..8c3be40 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -1,6 +1,6 @@ /* Provide a replacement for the POSIX nanosleep function. - Copyright (C) 1999-2000, 2002, 2004-2017 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Jim Meyering and Bruno Haible for the native Windows part */ diff --git a/lib/netdb.in.h b/lib/netdb.in.h index 6d95f1f..07ab17b 100644 --- a/lib/netdb.in.h +++ b/lib/netdb.in.h @@ -1,5 +1,5 @@ /* Provide a netdb.h header file for systems lacking it (read: MinGW). - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* This file is supposed to be used on platforms that lack . It is intended to provide definitions and prototypes needed by an diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h index 9411b9f..0f26cf5 100644 --- a/lib/netinet_in.in.h +++ b/lib/netinet_in.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_NETINET_IN_H diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index 270570f..725ccf6 100644 --- a/lib/nl_langinfo.c +++ b/lib/nl_langinfo.c @@ -1,6 +1,6 @@ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/open.c b/lib/open.c index 193dc45..b344f13 100644 --- a/lib/open.c +++ b/lib/open.c @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ @@ -38,6 +38,8 @@ orig_open (const char *filename, int flags, mode_t mode) this include because of the preliminary #include above. */ #include "fcntl.h" +#include "cloexec.h" + #include #include #include @@ -52,6 +54,13 @@ orig_open (const char *filename, int flags, mode_t mode) int open (const char *filename, int flags, ...) { + /* 0 = unknown, 1 = yes, -1 = no. */ +#if GNULIB_defined_O_CLOEXEC + int have_cloexec = -1; +#else + static int have_cloexec; +#endif + mode_t mode; int fd; @@ -115,7 +124,25 @@ open (const char *filename, int flags, ...) } #endif - fd = orig_open (filename, flags, mode); + fd = orig_open (filename, + flags & ~(have_cloexec <= 0 ? O_CLOEXEC : 0), mode); + + if (flags & O_CLOEXEC) + { + if (! have_cloexec) + { + if (0 <= fd) + have_cloexec = 1; + else if (errno == EINVAL) + { + fd = orig_open (filename, flags & ~O_CLOEXEC, mode); + have_cloexec = -1; + } + } + if (have_cloexec < 0 && 0 <= fd) + set_cloexec_flag (fd, true); + } + #if REPLACE_FCHDIR /* Implementing fchdir and fdopendir requires the ability to open a diff --git a/lib/pathmax.h b/lib/pathmax.h index aa0730e..1eafb49 100644 --- a/lib/pathmax.h +++ b/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _PATHMAX_H # define _PATHMAX_H @@ -68,7 +68,7 @@ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com, section "Maximum Path Length Limitation", - + explains that the maximum size of a filename, including the terminating NUL byte, is 260 = 3 + 256 + 1. This is the same value as diff --git a/lib/pipe-safer.c b/lib/pipe-safer.c index d24a1eb..1669d90 100644 --- a/lib/pipe-safer.c +++ b/lib/pipe-safer.c @@ -1,5 +1,5 @@ /* Invoke pipe, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Jim Meyering. */ diff --git a/lib/pipe.c b/lib/pipe.c index 2a6e38f..f87e11d 100644 --- a/lib/pipe.c +++ b/lib/pipe.c @@ -1,5 +1,5 @@ /* Create a pipe. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/pipe2-safer.c b/lib/pipe2-safer.c index 6db419b..71fef9e 100644 --- a/lib/pipe2-safer.c +++ b/lib/pipe2-safer.c @@ -1,5 +1,5 @@ /* Invoke pipe2, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Eric Blake. */ diff --git a/lib/pipe2.c b/lib/pipe2.c index 830f006..807ba6a 100644 --- a/lib/pipe2.c +++ b/lib/pipe2.c @@ -1,5 +1,5 @@ /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/printf-args.c b/lib/printf-args.c index fec7e62..1079e0a 100644 --- a/lib/printf-args.c +++ b/lib/printf-args.c @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2017 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* This file can be parametrized with the following macros: ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. diff --git a/lib/printf-args.h b/lib/printf-args.h index 36cab2a..111e8a5 100644 --- a/lib/printf-args.h +++ b/lib/printf-args.h @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2017 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _PRINTF_ARGS_H #define _PRINTF_ARGS_H diff --git a/lib/printf-parse.c b/lib/printf-parse.c index b9e04ae..ee5c3be 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* This file can be parametrized with the following macros: CHAR_T The element type of the format string. diff --git a/lib/printf-parse.h b/lib/printf-parse.h index b9bfa85..16d817e 100644 --- a/lib/printf-parse.h +++ b/lib/printf-parse.h @@ -1,5 +1,5 @@ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2017 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _PRINTF_PARSE_H #define _PRINTF_PARSE_H diff --git a/lib/quote.h b/lib/quote.h index 2e58fb5..eedc283 100644 --- a/lib/quote.h +++ b/lib/quote.h @@ -1,6 +1,6 @@ /* quote.h - prototypes for quote.c - Copyright (C) 1998-2001, 2003, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef QUOTE_H_ # define QUOTE_H_ 1 diff --git a/lib/quotearg.c b/lib/quotearg.c index 26903c7..fe68dca 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2017 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert */ @@ -54,6 +54,14 @@ #define INT_BITS (sizeof (int) * CHAR_BIT) +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + struct quoting_options { /* Basic quoting style. */ @@ -310,7 +318,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case c_maybe_quoting_style: quoting_style = c_quoting_style; elide_outer_quotes = true; - /* Fall through. */ + FALLTHROUGH; case c_quoting_style: if (!elide_outer_quotes) STORE ('"'); @@ -349,7 +357,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, for your locale. If you don't know what to put here, please see - + and use glyphs suitable for your language. */ left_quote = gettext_quote (N_("`"), quoting_style); right_quote = gettext_quote (N_("'"), quoting_style); @@ -365,14 +373,14 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case shell_escape_quoting_style: backslash_escapes = true; - /* Fall through. */ + FALLTHROUGH; case shell_quoting_style: elide_outer_quotes = true; - /* Fall through. */ + FALLTHROUGH; case shell_escape_always_quoting_style: if (!elide_outer_quotes) backslash_escapes = true; - /* Fall through. */ + FALLTHROUGH; case shell_always_quoting_style: quoting_style = shell_always_quoting_style; if (!elide_outer_quotes) @@ -505,7 +513,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, if (quoting_style == shell_always_quoting_style && elide_outer_quotes) goto force_outer_quoting_style; - /* Fall through. */ + /* fall through */ c_escape: if (backslash_escapes) { @@ -517,14 +525,14 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case '{': case '}': /* sometimes special if isolated */ if (! (argsize == SIZE_MAX ? arg[1] == '\0' : argsize == 1)) break; - /* Fall through. */ + FALLTHROUGH; case '#': case '~': if (i != 0) break; - /* Fall through. */ + FALLTHROUGH; case ' ': c_and_shell_quote_compat = true; - /* Fall through. */ + FALLTHROUGH; case '!': /* special in bash */ case '"': case '$': case '&': case '(': case ')': case '*': case ';': @@ -879,8 +887,9 @@ quotearg_n_options (int n, char const *arg, size_t argsize, if (nslots <= n) { bool preallocated = (sv == &slotvec0); + int nmax = MIN (INT_MAX, MIN (PTRDIFF_MAX, SIZE_MAX) / sizeof *sv) - 1; - if (MIN (INT_MAX, MIN (PTRDIFF_MAX, SIZE_MAX) / sizeof *sv) <= n) + if (nmax < n) xalloc_die (); slotvec = sv = xrealloc (preallocated ? NULL : sv, (n + 1) * sizeof *sv); @@ -1071,3 +1080,10 @@ quote (char const *arg) { return quote_n (0, arg); } + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/quotearg.h b/lib/quotearg.h index b82aa00..0584c56 100644 --- a/lib/quotearg.h +++ b/lib/quotearg.h @@ -1,6 +1,6 @@ /* quotearg.h - quote arguments for output - Copyright (C) 1998-2002, 2004, 2006, 2008-2017 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert */ diff --git a/lib/raise.c b/lib/raise.c index d3325a6..3a29339 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -1,6 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* written by Jim Meyering and Bruno Haible */ @@ -27,7 +27,9 @@ # include -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif # undef raise diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c index bba95b6..912bfeb 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/recv.c b/lib/recv.c index 20e8452..e57b9ed 100644 --- a/lib/recv.c +++ b/lib/recv.c @@ -1,6 +1,6 @@ /* recv.c --- wrappers for Windows recv function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/ref-add.sin b/lib/ref-add.sin index 3913e99..1bbf38f 100644 --- a/lib/ref-add.sin +++ b/lib/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, see . +# with this program; if not, see . # # Written by Bruno Haible . # diff --git a/lib/ref-del.sin b/lib/ref-del.sin index eeff947..5965092 100644 --- a/lib/ref-del.sin +++ b/lib/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, see . +# with this program; if not, see . # # Written by Bruno Haible . # diff --git a/lib/regcomp.c b/lib/regcomp.c index 6aaa6b1..c2c577a 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ #ifdef _LIBC # include @@ -59,7 +59,7 @@ static reg_errcode_t calc_inveclosure (re_dfa_t *dfa); static Idx fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax); static int peek_token (re_token_t *token, re_string_t *input, - reg_syntax_t syntax) internal_function; + reg_syntax_t syntax); static bin_tree_t *parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax, reg_errcode_t *err); static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg, @@ -516,6 +516,7 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags) return (int) ret; } #ifdef _LIBC +libc_hidden_def (__regcomp) weak_alias (__regcomp, regcomp) #endif @@ -658,6 +659,7 @@ regfree (regex_t *preg) preg->translate = NULL; } #ifdef _LIBC +libc_hidden_def (__regfree) weak_alias (__regfree, regfree) #endif @@ -699,7 +701,7 @@ re_comp (const char *s) if (re_comp_buf.fastmap == NULL) { - re_comp_buf.fastmap = (char *) malloc (SBC_MAX); + re_comp_buf.fastmap = re_malloc (char, SBC_MAX); if (re_comp_buf.fastmap == NULL) return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) REG_ESPACE]); @@ -935,7 +937,6 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) character used by some operators like "\<", "\>", etc. */ static void -internal_function init_word_char (re_dfa_t *dfa) { int i = 0; @@ -944,12 +945,15 @@ init_word_char (re_dfa_t *dfa) dfa->word_ops_used = 1; if (BE (dfa->map_notascii == 0, 1)) { + /* Avoid uint32_t and uint64_t as some non-GCC platforms lack + them, an issue when this code is used in Gnulib. */ bitset_word_t bits0 = 0x00000000; bitset_word_t bits1 = 0x03ff0000; bitset_word_t bits2 = 0x87fffffe; bitset_word_t bits3 = 0x07fffffe; if (BITSET_WORD_BITS == 64) { + /* Pacify gcc -Woverflow on 32-bit platformns. */ dfa->word_char[0] = bits1 << 31 << 1 | bits0; dfa->word_char[1] = bits3 << 31 << 1 | bits2; i = 2; @@ -1193,7 +1197,7 @@ analyze (regex_t *preg) break; if (i == preg->re_nsub) { - free (dfa->subexp_map); + re_free (dfa->subexp_map); dfa->subexp_map = NULL; } } @@ -1490,7 +1494,6 @@ link_nfa_nodes (void *extra, bin_tree_t *node) to their own constraint. */ static reg_errcode_t -internal_function duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node, Idx root_node, unsigned int init_constraint) { @@ -1782,7 +1785,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root) We must not use this function inside bracket expressions. */ static void -internal_function fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax) { re_string_skip_bytes (input, peek_token (result, input, syntax)); @@ -1792,7 +1794,6 @@ fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax) We must not use this function inside bracket expressions. */ static int -internal_function peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax) { unsigned char c; @@ -2031,7 +2032,6 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax) We must not use this function out of bracket expressions. */ static int -internal_function peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) { unsigned char c; @@ -2078,16 +2078,18 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) case '.': token->type = OP_OPEN_COLL_ELEM; break; + case '=': token->type = OP_OPEN_EQUIV_CLASS; break; + case ':': if (syntax & RE_CHAR_CLASSES) { token->type = OP_OPEN_CHAR_CLASS; break; } - /* else fall through. */ + FALLTHROUGH; default: token->type = CHARACTER; token->opr.c = c; @@ -2289,16 +2291,19 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, } #endif break; + case OP_OPEN_SUBEXP: tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; break; + case OP_OPEN_BRACKET: tree = parse_bracket_exp (regexp, dfa, token, syntax, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; break; + case OP_BACK_REF: if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1)) { @@ -2315,13 +2320,14 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, ++dfa->nbackref; dfa->has_mb_node = 1; break; + case OP_OPEN_DUP_NUM: if (syntax & RE_CONTEXT_INVALID_DUP) { *err = REG_BADRPT; return NULL; } - /* FALLTHROUGH */ + FALLTHROUGH; case OP_DUP_ASTERISK: case OP_DUP_PLUS: case OP_DUP_QUESTION: @@ -2335,7 +2341,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, fetch_token (token, regexp, syntax); return parse_expression (regexp, preg, token, syntax, nest, err); } - /* else fall through */ + FALLTHROUGH; case OP_CLOSE_SUBEXP: if ((token->type == OP_CLOSE_SUBEXP) && !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)) @@ -2343,7 +2349,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, *err = REG_ERPAREN; return NULL; } - /* else fall through */ + FALLTHROUGH; case OP_CLOSE_DUP_NUM: /* We treat it as a normal character. */ @@ -2358,6 +2364,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, return NULL; } break; + case ANCHOR: if ((token->opr.ctx_type & (WORD_DELIM | NOT_WORD_DELIM | WORD_FIRST | WORD_LAST)) @@ -2402,6 +2409,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, it must not be "". */ fetch_token (token, regexp, syntax); return tree; + case OP_PERIOD: tree = create_token_tree (dfa, NULL, NULL, token); if (BE (tree == NULL, 0)) @@ -2412,6 +2420,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, if (dfa->mb_cur_max > 1) dfa->has_mb_node = 1; break; + case OP_WORD: case OP_NOTWORD: tree = build_charclass_op (dfa, regexp->trans, @@ -2421,6 +2430,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; break; + case OP_SPACE: case OP_NOTSPACE: tree = build_charclass_op (dfa, regexp->trans, @@ -2430,12 +2440,15 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; break; + case OP_ALT: case END_OF_RE: return NULL; + case BACK_SLASH: *err = REG_EESCAPE; return NULL; + default: /* Must not happen? */ #ifdef DEBUG @@ -2693,7 +2706,6 @@ parse_byte (unsigned char b, re_charset_t *mbcset) update it. */ static reg_errcode_t -internal_function # ifdef RE_ENABLE_I18N build_range_exp (const reg_syntax_t syntax, bitset_t sbcset, @@ -2819,7 +2831,6 @@ build_range_exp (const reg_syntax_t syntax, pointer argument since we may update it. */ static reg_errcode_t -internal_function # ifdef RE_ENABLE_I18N build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, Idx *coll_sym_alloc, const unsigned char *name) diff --git a/lib/regex.c b/lib/regex.c index b46308b..499e1f0 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ #ifndef _LIBC # include diff --git a/lib/regex.h b/lib/regex.h index 18b8cbd..cf9a40c 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,6 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2017 Free Software + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ #ifndef _REGEX_H #define _REGEX_H 1 diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 9546b78..df27f69 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -15,19 +15,19 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ static void re_string_construct_common (const char *str, Idx len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, bool icase, - const re_dfa_t *dfa) internal_function; + const re_dfa_t *dfa); static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, - re_hashval_t hash) internal_function; + re_hashval_t hash); static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, - re_hashval_t hash) internal_function; + re_hashval_t hash); /* Functions for string operation. */ @@ -35,7 +35,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, re_string_reconstruct before using the object. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len, RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa) { @@ -63,7 +63,7 @@ re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len, /* This function allocate the buffers, and initialize them. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_construct (re_string_t *pstr, const char *str, Idx len, RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa) { @@ -126,7 +126,7 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len, /* Helper functions for re_string_allocate, and re_string_construct. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len) { #ifdef RE_ENABLE_I18N @@ -166,7 +166,6 @@ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len) static void -internal_function re_string_construct_common (const char *str, Idx len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa) @@ -198,7 +197,6 @@ re_string_construct_common (const char *str, Idx len, re_string_t *pstr, built and starts from PSTR->VALID_LEN. */ static void -internal_function build_wcs_buffer (re_string_t *pstr) { #ifdef _LIBC @@ -267,7 +265,7 @@ build_wcs_buffer (re_string_t *pstr) but for REG_ICASE. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ build_wcs_upper_buffer (re_string_t *pstr) { mbstate_t prev_st; @@ -484,7 +482,6 @@ build_wcs_upper_buffer (re_string_t *pstr) Return the index. */ static Idx -internal_function re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc) { mbstate_t prev_st; @@ -525,7 +522,6 @@ re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc) This function is used in case of REG_ICASE. */ static void -internal_function build_upper_buffer (re_string_t *pstr) { Idx char_idx, end_idx; @@ -545,7 +541,6 @@ build_upper_buffer (re_string_t *pstr) /* Apply TRANS to the buffer in PSTR. */ static void -internal_function re_string_translate_buffer (re_string_t *pstr) { Idx buf_idx, end_idx; @@ -566,7 +561,7 @@ re_string_translate_buffer (re_string_t *pstr) convert to upper case in case of REG_ICASE, apply translation. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) { Idx offset; @@ -829,7 +824,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) } static unsigned char -internal_function __attribute__ ((pure)) +__attribute__ ((pure)) re_string_peek_byte_case (const re_string_t *pstr, Idx idx) { int ch; @@ -866,7 +861,6 @@ re_string_peek_byte_case (const re_string_t *pstr, Idx idx) } static unsigned char -internal_function re_string_fetch_byte_case (re_string_t *pstr) { if (BE (!pstr->mbs_allocated, 1)) @@ -904,7 +898,6 @@ re_string_fetch_byte_case (re_string_t *pstr) } static void -internal_function re_string_destruct (re_string_t *pstr) { #ifdef RE_ENABLE_I18N @@ -918,7 +911,6 @@ re_string_destruct (re_string_t *pstr) /* Return the context at IDX in INPUT. */ static unsigned int -internal_function re_string_context_at (const re_string_t *input, Idx idx, int eflags) { int c; @@ -963,7 +955,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) /* Functions for set operation. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_alloc (re_node_set *set, Idx size) { set->alloc = size; @@ -975,7 +967,7 @@ re_node_set_alloc (re_node_set *set, Idx size) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_1 (re_node_set *set, Idx elem) { set->alloc = 1; @@ -991,7 +983,7 @@ re_node_set_init_1 (re_node_set *set, Idx elem) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2) { set->alloc = 2; @@ -1021,7 +1013,7 @@ re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_copy (re_node_set *dest, const re_node_set *src) { dest->nelem = src->nelem; @@ -1046,7 +1038,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src) Note: We assume dest->elems is NULL, when dest->alloc is 0. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1, const re_node_set *src2) { @@ -1137,7 +1129,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1, DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_union (re_node_set *dest, const re_node_set *src1, const re_node_set *src2) { @@ -1190,7 +1182,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1, DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_merge (re_node_set *dest, const re_node_set *src) { Idx is, id, sbase, delta; @@ -1273,7 +1265,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) Return true if successful. */ static bool -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_insert (re_node_set *set, Idx elem) { Idx idx; @@ -1325,7 +1317,7 @@ re_node_set_insert (re_node_set *set, Idx elem) Return true if successful. */ static bool -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_insert_last (re_node_set *set, Idx elem) { /* Realloc if we need. */ @@ -1348,7 +1340,7 @@ re_node_set_insert_last (re_node_set *set, Idx elem) Return true if SET1 and SET2 are equivalent. */ static bool -internal_function __attribute__ ((pure)) +__attribute__ ((pure)) re_node_set_compare (const re_node_set *set1, const re_node_set *set2) { Idx i; @@ -1363,7 +1355,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2) /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */ static Idx -internal_function __attribute__ ((pure)) +__attribute__ ((pure)) re_node_set_contains (const re_node_set *set, Idx elem) { __re_size_t idx, right, mid; @@ -1385,7 +1377,6 @@ re_node_set_contains (const re_node_set *set, Idx elem) } static void -internal_function re_node_set_remove_at (re_node_set *set, Idx idx) { if (idx < 0 || idx >= set->nelem) @@ -1400,7 +1391,6 @@ re_node_set_remove_at (re_node_set *set, Idx idx) Or return -1 if an error occurred. */ static Idx -internal_function re_dfa_add_node (re_dfa_t *dfa, re_token_t token) { if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0)) @@ -1454,7 +1444,6 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) } static re_hashval_t -internal_function calc_state_hash (const re_node_set *nodes, unsigned int context) { re_hashval_t hash = nodes->nelem + context; @@ -1474,7 +1463,7 @@ calc_state_hash (const re_node_set *nodes, unsigned int context) optimization. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa, const re_node_set *nodes) { @@ -1522,7 +1511,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa, optimization. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context) { @@ -1618,7 +1607,7 @@ free_state (re_dfastate_t *state) Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, re_hashval_t hash) { @@ -1668,7 +1657,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, re_hashval_t hash) { diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 3580c45..88add80 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 @@ -102,6 +102,7 @@ __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) # endif #else +# undef gettext # define gettext(msgid) (msgid) #endif @@ -437,23 +438,19 @@ struct re_dfa_t; typedef struct re_dfa_t re_dfa_t; #ifndef _LIBC -# define internal_function # define IS_IN(libc) false #endif static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, - Idx new_buf_len) - internal_function; + Idx new_buf_len); #ifdef RE_ENABLE_I18N -static void build_wcs_buffer (re_string_t *pstr) internal_function; -static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) - internal_function; +static void build_wcs_buffer (re_string_t *pstr); +static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr); #endif /* RE_ENABLE_I18N */ -static void build_upper_buffer (re_string_t *pstr) internal_function; -static void re_string_translate_buffer (re_string_t *pstr) internal_function; +static void build_upper_buffer (re_string_t *pstr); +static void re_string_translate_buffer (re_string_t *pstr); static unsigned int re_string_context_at (const re_string_t *input, Idx idx, - int eflags) - internal_function __attribute__ ((pure)); + int eflags) __attribute__ ((pure)); #define re_string_peek_byte(pstr, offset) \ ((pstr)->mbs[(pstr)->cur_idx + offset]) @@ -830,7 +827,7 @@ bitset_mask (bitset_t dest, const bitset_t src) #ifdef RE_ENABLE_I18N /* Functions for re_string. */ static int -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_char_size_at (const re_string_t *pstr, Idx idx) { int byte_idx; @@ -843,7 +840,7 @@ re_string_char_size_at (const re_string_t *pstr, Idx idx) } static wint_t -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_wchar_at (const re_string_t *pstr, Idx idx) { if (pstr->mb_cur_max == 1) @@ -856,7 +853,7 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx) # endif static int -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_elem_size_at (const re_string_t *pstr, Idx idx) { # ifdef _LIBC @@ -898,4 +895,12 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx) # define __attribute_warn_unused_result__ /* empty */ #endif +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + #endif /* _REGEX_INTERNAL_H */ diff --git a/lib/regexec.c b/lib/regexec.c index 45bc796..fc18850 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -15,192 +15,162 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see - . */ + . */ static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - Idx n) internal_function; -static void match_ctx_clean (re_match_context_t *mctx) internal_function; -static void match_ctx_free (re_match_context_t *cache) internal_function; + Idx n); +static void match_ctx_clean (re_match_context_t *mctx); +static void match_ctx_free (re_match_context_t *cache); static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, Idx node, - Idx str_idx, Idx from, Idx to) - internal_function; -static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx) - internal_function; + Idx str_idx, Idx from, Idx to); +static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx); static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, Idx node, - Idx str_idx) internal_function; + Idx str_idx); static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop, - Idx node, Idx str_idx) - internal_function; + Idx node, Idx str_idx); static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, re_dfastate_t **limited_sts, Idx last_node, - Idx last_str_idx) - internal_function; + Idx last_str_idx); static reg_errcode_t re_search_internal (const regex_t *preg, const char *string, Idx length, Idx start, Idx last_start, Idx stop, size_t nmatch, regmatch_t pmatch[], - int eflags) internal_function; + int eflags); static regoff_t re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, Idx length1, const char *string2, Idx length2, Idx start, regoff_t range, struct re_registers *regs, - Idx stop, bool ret_len) internal_function; + Idx stop, bool ret_len); static regoff_t re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length, Idx start, regoff_t range, Idx stop, struct re_registers *regs, - bool ret_len) internal_function; + bool ret_len); static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, - Idx nregs, int regs_allocated) internal_function; -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) - internal_function; + Idx nregs, int regs_allocated); +static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match, - Idx *p_match_first) internal_function; + Idx *p_match_first); static Idx check_halt_state_context (const re_match_context_t *mctx, - const re_dfastate_t *state, Idx idx) - internal_function; + const re_dfastate_t *state, Idx idx); static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, regmatch_t *prev_idx_match, Idx cur_node, - Idx cur_idx, Idx nmatch) internal_function; + Idx cur_idx, Idx nmatch); static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, Idx nregs, regmatch_t *regs, - re_node_set *eps_via_nodes) - internal_function; + re_node_set *eps_via_nodes); static reg_errcode_t set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *pmatch, - bool fl_backtrack) internal_function; -static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs) - internal_function; + bool fl_backtrack); +static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs); #ifdef RE_ENABLE_I18N static int sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, - Idx node_idx, Idx str_idx, Idx max_str_idx) - internal_function; + Idx node_idx, Idx str_idx, Idx max_str_idx); #endif /* RE_ENABLE_I18N */ static reg_errcode_t sift_states_backward (const re_match_context_t *mctx, - re_sift_context_t *sctx) - internal_function; + re_sift_context_t *sctx); static reg_errcode_t build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx str_idx, - re_node_set *cur_dest) - internal_function; + re_node_set *cur_dest); static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx str_idx, - re_node_set *dest_nodes) - internal_function; + re_node_set *dest_nodes); static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, - const re_node_set *candidates) - internal_function; + const re_node_set *candidates); static bool check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits, Idx dst_node, Idx dst_idx, Idx src_node, - Idx src_idx) internal_function; + Idx src_idx); static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, Idx subexp_idx, - Idx from_node, Idx bkref_idx) - internal_function; + Idx from_node, Idx bkref_idx); static int check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit, Idx subexp_idx, Idx node, Idx str_idx, - Idx bkref_idx) internal_function; + Idx bkref_idx); static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates, re_node_set *limits, struct re_backref_cache_entry *bkref_ents, - Idx str_idx) internal_function; + Idx str_idx); static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, - Idx str_idx, const re_node_set *candidates) - internal_function; + Idx str_idx, const re_node_set *candidates); static reg_errcode_t merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, - re_dfastate_t **src, Idx num) - internal_function; + re_dfastate_t **src, Idx num); static re_dfastate_t *find_recover_state (reg_errcode_t *err, - re_match_context_t *mctx) internal_function; + re_match_context_t *mctx); static re_dfastate_t *transit_state (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *state) internal_function; + re_dfastate_t *state); static re_dfastate_t *merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *next_state) - internal_function; + re_dfastate_t *next_state); static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes, - Idx str_idx) internal_function; + Idx str_idx); #if 0 static re_dfastate_t *transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; + re_dfastate_t *pstate); #endif #ifdef RE_ENABLE_I18N static reg_errcode_t transit_state_mb (re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; + re_dfastate_t *pstate); #endif /* RE_ENABLE_I18N */ static reg_errcode_t transit_state_bkref (re_match_context_t *mctx, - const re_node_set *nodes) - internal_function; + const re_node_set *nodes); static reg_errcode_t get_subexp (re_match_context_t *mctx, - Idx bkref_node, Idx bkref_str_idx) - internal_function; + Idx bkref_node, Idx bkref_str_idx); static reg_errcode_t get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, re_sub_match_last_t *sub_last, - Idx bkref_node, Idx bkref_str) - internal_function; + Idx bkref_node, Idx bkref_str); static Idx find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, - Idx subexp_idx, int type) internal_function; + Idx subexp_idx, int type); static reg_errcode_t check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node, Idx top_str, Idx last_node, Idx last_str, - int type) internal_function; + int type); static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, re_node_set *cur_nodes, - re_node_set *next_nodes) - internal_function; + re_node_set *next_nodes); static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, - Idx ex_subexp, int type) - internal_function; + Idx ex_subexp, int type); static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, Idx target, Idx ex_subexp, - int type) internal_function; + int type); static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, Idx cur_str, - Idx subexp_num, int type) - internal_function; -static bool build_trtable (const re_dfa_t *dfa, - re_dfastate_t *state) internal_function; + Idx subexp_num, int type); +static bool build_trtable (const re_dfa_t *dfa, re_dfastate_t *state); #ifdef RE_ENABLE_I18N static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, - const re_string_t *input, Idx idx) - internal_function; + const re_string_t *input, Idx idx); # ifdef _LIBC static unsigned int find_collation_sequence_value (const unsigned char *mbs, - size_t name_len) - internal_function; + size_t name_len); # endif /* _LIBC */ #endif /* RE_ENABLE_I18N */ static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, re_node_set *states_node, - bitset_t *states_ch) internal_function; + bitset_t *states_ch); static bool check_node_accept (const re_match_context_t *mctx, - const re_token_t *node, Idx idx) - internal_function; -static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) - internal_function; + const re_token_t *node, Idx idx); +static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len); /* Entry point for POSIX code. */ @@ -252,6 +222,8 @@ regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string, } #ifdef _LIBC +libc_hidden_def (__regexec) + # include versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4); @@ -346,7 +318,6 @@ weak_alias (__re_search_2, re_search_2) #endif static regoff_t -internal_function re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, Idx length1, const char *string2, Idx length2, Idx start, regoff_t range, struct re_registers *regs, @@ -395,7 +366,6 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, otherwise the position of the match is returned. */ static regoff_t -internal_function re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length, Idx start, regoff_t range, Idx stop, struct re_registers *regs, bool ret_len) @@ -485,7 +455,6 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length, } static unsigned -internal_function re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs, int regs_allocated) { @@ -611,7 +580,7 @@ re_exec (const char *s) (0 <= LAST_START && LAST_START <= LENGTH) */ static reg_errcode_t -__attribute_warn_unused_result__ internal_function +__attribute_warn_unused_result__ re_search_internal (const regex_t *preg, const char *string, Idx length, Idx start, Idx last_start, Idx stop, size_t nmatch, regmatch_t pmatch[], int eflags) @@ -945,7 +914,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; @@ -1041,7 +1010,7 @@ prune_impossible_nodes (re_match_context_t *mctx) since initial states may have constraints like "\<", "^", etc.. */ static inline re_dfastate_t * -__attribute__ ((always_inline)) internal_function +__attribute__ ((always_inline)) acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, Idx idx) { @@ -1083,7 +1052,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, index of the buffer. */ static Idx -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_matching (re_match_context_t *mctx, bool fl_longest_match, Idx *p_match_first) { @@ -1216,7 +1185,6 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match, /* Check NODE match the current context. */ static bool -internal_function check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context) { re_token_type_t type = dfa->nodes[node].type; @@ -1235,7 +1203,6 @@ check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context) match the context, return the node. */ static Idx -internal_function check_halt_state_context (const re_match_context_t *mctx, const re_dfastate_t *state, Idx idx) { @@ -1257,7 +1224,6 @@ check_halt_state_context (const re_match_context_t *mctx, return -1 in case of errors. */ static Idx -internal_function proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, Idx *pidx, Idx node, re_node_set *eps_via_nodes, struct re_fail_stack_t *fs) @@ -1359,7 +1325,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes) { @@ -1368,8 +1334,8 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, if (fs->num == fs->alloc) { struct re_fail_stack_ent_t *new_array; - new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t) - * fs->alloc * 2)); + new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t, + fs->alloc * 2); if (new_array == NULL) return REG_ESPACE; fs->alloc *= 2; @@ -1386,7 +1352,6 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, } static Idx -internal_function pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes) { @@ -1406,7 +1371,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs, pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *pmatch, bool fl_backtrack) { @@ -1513,7 +1478,6 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, } static reg_errcode_t -internal_function free_fail_stack_return (struct re_fail_stack_t *fs) { if (fs) @@ -1530,7 +1494,6 @@ free_fail_stack_return (struct re_fail_stack_t *fs) } static void -internal_function update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, regmatch_t *prev_idx_match, Idx cur_node, Idx cur_idx, Idx nmatch) { @@ -1602,7 +1565,6 @@ update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, ((state) != NULL && re_node_set_contains (&(state)->nodes, node)) static reg_errcode_t -internal_function sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) { reg_errcode_t err; @@ -1660,7 +1622,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx str_idx, re_node_set *cur_dest) { @@ -1722,7 +1684,6 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, /* Helper functions. */ static reg_errcode_t -internal_function clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx) { Idx top = mctx->state_log_top; @@ -1748,7 +1709,6 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx) } static reg_errcode_t -internal_function merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, re_dfastate_t **src, Idx num) { @@ -1775,7 +1735,6 @@ merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, } static reg_errcode_t -internal_function update_cur_sifted_state (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx str_idx, re_node_set *dest_nodes) @@ -1823,7 +1782,7 @@ update_cur_sifted_state (const re_match_context_t *mctx, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates) { @@ -1852,7 +1811,6 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, } static reg_errcode_t -internal_function sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes, const re_node_set *candidates) { @@ -1901,7 +1859,6 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes, } static bool -internal_function check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits, Idx dst_node, Idx dst_idx, Idx src_node, Idx src_idx) { @@ -1937,7 +1894,6 @@ check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits, } static int -internal_function check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, Idx subexp_idx, Idx from_node, Idx bkref_idx) { @@ -2019,7 +1975,6 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, } static int -internal_function check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit, Idx subexp_idx, Idx from_node, Idx str_idx, Idx bkref_idx) @@ -2049,7 +2004,6 @@ check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit, which are against limitations from DEST_NODES. */ static reg_errcode_t -internal_function check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates, re_node_set *limits, struct re_backref_cache_entry *bkref_ents, Idx str_idx) @@ -2137,7 +2091,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx str_idx, const re_node_set *candidates) { @@ -2237,7 +2191,6 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, #ifdef RE_ENABLE_I18N static int -internal_function sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx node_idx, Idx str_idx, Idx max_str_idx) { @@ -2267,7 +2220,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, update the destination of STATE_LOG. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ transit_state (reg_errcode_t *err, re_match_context_t *mctx, re_dfastate_t *state) { @@ -2325,7 +2278,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx, /* Update the state_log if we need */ static re_dfastate_t * -internal_function merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, re_dfastate_t *next_state) { @@ -2404,7 +2356,6 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, multi-byte match, then look in the log for a state from which to restart matching. */ static re_dfastate_t * -internal_function find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) { re_dfastate_t *cur_state; @@ -2435,7 +2386,6 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) corresponding back references. */ static reg_errcode_t -internal_function check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes, Idx str_idx) { @@ -2508,7 +2458,6 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx, #ifdef RE_ENABLE_I18N static reg_errcode_t -internal_function transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) { const re_dfa_t *const dfa = mctx->dfa; @@ -2579,7 +2528,6 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) #endif /* RE_ENABLE_I18N */ static reg_errcode_t -internal_function transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) { const re_dfa_t *const dfa = mctx->dfa; @@ -2693,7 +2641,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) delay these checking for prune_impossible_nodes(). */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx) { const re_dfa_t *const dfa = mctx->dfa; @@ -2843,7 +2791,6 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx) and SUB_LAST. */ static reg_errcode_t -internal_function get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, re_sub_match_last_t *sub_last, Idx bkref_node, Idx bkref_str) { @@ -2872,7 +2819,6 @@ get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, E.g. RE: (a){2} */ static Idx -internal_function find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, Idx subexp_idx, int type) { @@ -2894,7 +2840,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node, Idx top_str, Idx last_node, Idx last_str, int type) { @@ -3059,7 +3005,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node, Can't we unify them? */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, re_node_set *cur_nodes, re_node_set *next_nodes) { @@ -3140,7 +3086,6 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, */ static reg_errcode_t -internal_function check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, Idx ex_subexp, int type) { @@ -3193,7 +3138,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, problematic append it to DST_NODES. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, Idx target, Idx ex_subexp, int type) { @@ -3238,7 +3183,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, in MCTX->BKREF_ENTS. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, Idx cur_str, Idx subexp_num, int type) { @@ -3327,7 +3272,6 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, Return true if successful. */ static bool -internal_function build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) { reg_errcode_t err; @@ -3375,7 +3319,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) if (BE (ndests <= 0, 0)) { if (dests_node_malloced) - free (dests_alloc); + re_free (dests_alloc); /* Return false in case of an error, true otherwise. */ if (ndests == 0) { @@ -3405,18 +3349,17 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) alloca (ndests * 3 * sizeof (re_dfastate_t *)); else { - dest_states = (re_dfastate_t **) - malloc (ndests * 3 * sizeof (re_dfastate_t *)); + dest_states = re_malloc (re_dfastate_t *, ndests * 3); if (BE (dest_states == NULL, 0)) { out_free: if (dest_states_malloced) - free (dest_states); + re_free (dest_states); re_node_set_free (&follows); for (i = 0; i < ndests; ++i) re_node_set_free (dests_node + i); if (dests_node_malloced) - free (dests_alloc); + re_free (dests_alloc); return false; } dest_states_malloced = true; @@ -3547,14 +3490,14 @@ out_free: } if (dest_states_malloced) - free (dest_states); + re_free (dest_states); re_node_set_free (&follows); for (i = 0; i < ndests; ++i) re_node_set_free (dests_node + i); if (dests_node_malloced) - free (dests_alloc); + re_free (dests_alloc); return true; } @@ -3565,7 +3508,6 @@ out_free: to DEST_CH[i]. This function return the number of destinations. */ static Idx -internal_function group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, re_node_set *dests_node, bitset_t *dests_ch) { @@ -3762,7 +3704,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, # endif static int -internal_function check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, const re_string_t *input, Idx str_idx) { @@ -3992,7 +3933,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, # ifdef _LIBC static unsigned int -internal_function find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) { uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); @@ -4056,7 +3996,6 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) byte of the INPUT. */ static bool -internal_function check_node_accept (const re_match_context_t *mctx, const re_token_t *node, Idx idx) { @@ -4078,7 +4017,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, case OP_UTF8_PERIOD: if (ch >= ASCII_CHARS) return false; - /* FALLTHROUGH */ + FALLTHROUGH; #endif case OP_PERIOD: if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE)) @@ -4106,7 +4045,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, /* Extend the buffers, if the buffers have run out. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ extend_buffers (re_match_context_t *mctx, int min_len) { reg_errcode_t ret; @@ -4172,7 +4111,7 @@ extend_buffers (re_match_context_t *mctx, int min_len) /* Initialize MCTX. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_init (re_match_context_t *mctx, int eflags, Idx n) { mctx->eflags = eflags; @@ -4207,7 +4146,6 @@ match_ctx_init (re_match_context_t *mctx, int eflags, Idx n) of the input, or changes the input string. */ static void -internal_function match_ctx_clean (re_match_context_t *mctx) { Idx st_idx; @@ -4227,7 +4165,7 @@ match_ctx_clean (re_match_context_t *mctx) re_free (top->path->array); re_free (top->path); } - free (top); + re_free (top); } mctx->nsub_tops = 0; @@ -4237,7 +4175,6 @@ match_ctx_clean (re_match_context_t *mctx) /* Free all the memory associated with MCTX. */ static void -internal_function match_ctx_free (re_match_context_t *mctx) { /* First, free all the memory associated with MCTX->SUB_TOPS. */ @@ -4252,7 +4189,7 @@ match_ctx_free (re_match_context_t *mctx) */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from, Idx to) { @@ -4301,7 +4238,6 @@ match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from, found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */ static Idx -internal_function search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx) { Idx left, right, mid, last; @@ -4324,7 +4260,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx) at STR_IDX. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx) { #ifdef DEBUG @@ -4354,7 +4290,6 @@ match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx) at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP. */ static re_sub_match_last_t * -internal_function match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx) { re_sub_match_last_t *new_entry; @@ -4381,7 +4316,6 @@ match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx) } static void -internal_function sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, re_dfastate_t **limited_sts, Idx last_node, Idx last_str_idx) { diff --git a/lib/sched.in.h b/lib/sched.in.h index aa96aed..34e9655 100644 --- a/lib/sched.in.h +++ b/lib/sched.in.h @@ -1,5 +1,5 @@ /* A GNU-like . - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _@GUARD_PREFIX@_SCHED_H @@ -34,15 +34,18 @@ /* Get pid_t. This is needed on glibc 2.11 (see - glibc bug ) + glibc bug ) and Mac OS X 10.5. */ #include #ifdef __KLIBC__ - -/* On OS/2 kLIBC, struct sched_param is in spawn.h */ +/* On OS/2 kLIBC, struct sched_param is in spawn.h. */ # include +#endif +#ifdef __VMS +/* On OpenVMS, struct sched_param is in . */ +# include #endif #if !@HAVE_STRUCT_SCHED_PARAM@ diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index df53dea..099da63 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -1,6 +1,6 @@ /* Look up an environment variable, returning NULL in insecure situations. - Copyright 2013-2017 Free Software Foundation, Inc. + Copyright 2013-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/select.c b/lib/select.c index e37484d..92ca725 100644 --- a/lib/select.c +++ b/lib/select.c @@ -1,7 +1,7 @@ /* Emulation for select(2) Contributed by Paolo Bonzini. - Copyright 2008-2017 Free Software Foundation, Inc. + Copyright 2008-2018 Free Software Foundation, Inc. This file is part of gnulib. @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include #include @@ -39,7 +39,11 @@ /* Get the overridden 'struct timeval'. */ #include -#include "msvc-nothrow.h" +#if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +#else +# include +#endif #undef select diff --git a/lib/send.c b/lib/send.c index b837174..7226bf4 100644 --- a/lib/send.c +++ b/lib/send.c @@ -1,6 +1,6 @@ /* send.c --- wrappers for Windows send function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/setsockopt.c b/lib/setsockopt.c index 157e4b6..1a7b583 100644 --- a/lib/setsockopt.c +++ b/lib/setsockopt.c @@ -1,6 +1,6 @@ /* setsockopt.c --- wrappers for Windows setsockopt function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/sha1.c b/lib/sha1.c index ea0474f..ce0f0b2 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -1,7 +1,7 @@ /* sha1.c - Functions to compute SHA1 message digest of files or memory blocks according to the NIST specification FIPS-180-1. - Copyright (C) 2000-2001, 2003-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Scott G. Miller Credits: @@ -233,7 +233,8 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx); ctx->buflen &= 63; - /* The regions in the following copy operation cannot overlap. */ + /* The regions in the following copy operation cannot overlap, + because ctx->buflen < 64 ≤ (left_over + add) & ~63. */ memcpy (ctx->buffer, &((char *) ctx->buffer)[(left_over + add) & ~63], ctx->buflen); @@ -275,6 +276,8 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) { sha1_process_block (ctx->buffer, 64, ctx); left_over -= 64; + /* The regions in the following copy operation cannot overlap, + because left_over ≤ 64. */ memcpy (ctx->buffer, &ctx->buffer[16], left_over); } ctx->buflen = left_over; @@ -431,3 +434,10 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha1.h b/lib/sha1.h index 7d7e19a..b1db15d 100644 --- a/lib/sha1.h +++ b/lib/sha1.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA1 sum library functions. - Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2017 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef SHA1_H # define SHA1_H 1 @@ -46,8 +46,8 @@ struct sha1_ctx uint32_t E; uint32_t total[2]; - uint32_t buflen; - uint32_t buffer[32]; + uint32_t buflen; /* ≥ 0, ≤ 128 */ + uint32_t buffer[32]; /* 128 bytes; the first buflen bytes are in use */ }; /* Initialize structure containing state of computation. */ @@ -98,3 +98,10 @@ extern int sha1_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha256.c b/lib/sha256.c index 03d3899..85405b2 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -1,7 +1,7 @@ /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by David Madore, considerably copypasting from Scott G. Miller's sha1.c @@ -366,7 +366,8 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) sha256_process_block (ctx->buffer, ctx->buflen & ~63, ctx); ctx->buflen &= 63; - /* The regions in the following copy operation cannot overlap. */ + /* The regions in the following copy operation cannot overlap, + because ctx->buflen < 64 ≤ (left_over + add) & ~63. */ memcpy (ctx->buffer, &((char *) ctx->buffer)[(left_over + add) & ~63], ctx->buflen); @@ -408,6 +409,8 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx) { sha256_process_block (ctx->buffer, 64, ctx); left_over -= 64; + /* The regions in the following copy operation cannot overlap, + because left_over ≤ 64. */ memcpy (ctx->buffer, &ctx->buffer[16], left_over); } ctx->buflen = left_over; @@ -574,3 +577,10 @@ sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha256.h b/lib/sha256.h index ffb91fa..e344986 100644 --- a/lib/sha256.h +++ b/lib/sha256.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA256 and SHA224 sum library functions. - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef SHA256_H # define SHA256_H 1 @@ -44,8 +44,8 @@ struct sha256_ctx uint32_t state[8]; uint32_t total[2]; - size_t buflen; - uint32_t buffer[32]; + size_t buflen; /* ≥ 0, ≤ 128 */ + uint32_t buffer[32]; /* 128 bytes; the first buflen bytes are in use */ }; /* Initialize structure containing state of computation. */ @@ -101,3 +101,10 @@ extern int sha224_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha512.c b/lib/sha512.c index 6876bfd..8a6dd4e 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -1,7 +1,7 @@ /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or memory blocks according to the NIST specification FIPS-180-2. - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by David Madore, considerably copypasting from Scott G. Miller's sha1.c @@ -374,7 +374,8 @@ sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx); ctx->buflen &= 127; - /* The regions in the following copy operation cannot overlap. */ + /* The regions in the following copy operation cannot overlap, + because ctx->buflen < 128 ≤ (left_over + add) & ~127. */ memcpy (ctx->buffer, &((char *) ctx->buffer)[(left_over + add) & ~127], ctx->buflen); @@ -416,6 +417,8 @@ sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx) { sha512_process_block (ctx->buffer, 128, ctx); left_over -= 128; + /* The regions in the following copy operation cannot overlap, + because left_over ≤ 128. */ memcpy (ctx->buffer, &ctx->buffer[16], left_over); } ctx->buflen = left_over; @@ -626,3 +629,10 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha512.h b/lib/sha512.h index 121e6c3..6a0aadb 100644 --- a/lib/sha512.h +++ b/lib/sha512.h @@ -1,6 +1,6 @@ /* Declarations of functions and data types used for SHA512 and SHA384 sum library functions. - Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef SHA512_H # define SHA512_H 1 @@ -44,8 +44,8 @@ struct sha512_ctx u64 state[8]; u64 total[2]; - size_t buflen; - u64 buffer[32]; + size_t buflen; /* ≥ 0, ≤ 256 */ + u64 buffer[32]; /* 256 bytes; the first buflen bytes are in use */ }; /* Initialize structure containing state of computation. */ @@ -104,3 +104,10 @@ extern int sha384_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sig-handler.h b/lib/sig-handler.h index b6fd841..ce28a2a 100644 --- a/lib/sig-handler.h +++ b/lib/sig-handler.h @@ -1,6 +1,6 @@ /* Convenience declarations when working with . - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _GL_SIG_HANDLER_H #define _GL_SIG_HANDLER_H diff --git a/lib/sigaction.c b/lib/sigaction.c index 380f9fc..da46b1c 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Eric Blake , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/signal.in.h b/lib/signal.in.h index 1ffba37..7d4927b 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -137,7 +137,7 @@ _GL_FUNCDECL_RPL (pthread_sigmask, int, _GL_CXXALIAS_RPL (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # else -# if !@HAVE_PTHREAD_SIGMASK@ +# if !(@HAVE_PTHREAD_SIGMASK@ || defined pthread_sigmask) _GL_FUNCDECL_SYS (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # endif @@ -200,7 +200,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; /* When also using extern inline, suppress the use of static inline in standard headers of problematic Apple configurations, as Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., - . + . Perhaps Apple will fix this some day. */ #if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ && (defined __i386__ || defined __x86_64__)) diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c index ec4cfeb..0a8cd53 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/size_max.h b/lib/size_max.h index f0c00b4..00500b5 100644 --- a/lib/size_max.h +++ b/lib/size_max.h @@ -1,5 +1,5 @@ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef GNULIB_SIZE_MAX_H #define GNULIB_SIZE_MAX_H diff --git a/lib/snprintf.c b/lib/snprintf.c index d66302f..8a9971b 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2018 Free Software Foundation, Inc. Written by Simon Josefsson and Paul Eggert. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/socket.c b/lib/socket.c index 47aa557..84f4d94 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -1,6 +1,6 @@ /* socket.c --- wrappers for Windows socket function - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ diff --git a/lib/sockets.c b/lib/sockets.c index 9333ee4..eec1ec8 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Simon Josefsson */ @@ -28,7 +28,11 @@ # include # include "fd-hook.h" -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif /* Get set_winsock_errno, FD_TO_SOCKET etc. */ # include "w32sock.h" diff --git a/lib/sockets.h b/lib/sockets.h index 8392e57..5a83332 100644 --- a/lib/sockets.h +++ b/lib/sockets.h @@ -1,6 +1,6 @@ /* sockets.h - wrappers for Windows socket functions - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,12 +13,12 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Simon Josefsson */ #ifndef SOCKETS_H -# define SOCKETS_H 1 +#define SOCKETS_H 1 #define SOCKETS_1_0 0x0001 #define SOCKETS_1_1 0x0101 @@ -43,9 +43,13 @@ int gl_sockets_cleanup (void) other library that only accepts sockets. */ #ifdef WINDOWS_SOCKETS -#include +# include -#include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif static inline SOCKET gl_fd_to_handle (int fd) @@ -55,7 +59,7 @@ gl_fd_to_handle (int fd) #else -#define gl_fd_to_handle(x) (x) +# define gl_fd_to_handle(x) (x) #endif /* WINDOWS_SOCKETS */ diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index 7e8f241..8a5956d 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -13,9 +13,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ +/* Tell clang not to warn about the 'child' variable, below. */ +#if defined __clang__ +# pragma clang diagnostic ignored "-Wconditional-uninitialized" +#endif + #include /* Specification. */ diff --git a/lib/spawn-pipe.h b/lib/spawn-pipe.h index 6c268fb..755356c 100644 --- a/lib/spawn-pipe.h +++ b/lib/spawn-pipe.h @@ -1,5 +1,5 @@ /* Creation of subprocesses, communicating via pipes. - Copyright (C) 2001-2003, 2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _SPAWN_PIPE_H #define _SPAWN_PIPE_H diff --git a/lib/spawn.c b/lib/spawn.c index 6899fd0..f15e0cd 100644 --- a/lib/spawn.c +++ b/lib/spawn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn.in.h b/lib/spawn.in.h index b4b9197..b0dfcb5 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -1,5 +1,5 @@ /* Definitions for POSIX spawn interface. - Copyright (C) 2000, 2003-2004, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2000, 2003-2004, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _@GUARD_PREFIX@_SPAWN_H diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c index 529a7c0..93827dc 100644 --- a/lib/spawn_faction_addclose.c +++ b/lib/spawn_faction_addclose.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c index 440f215..86ae0af 100644 --- a/lib/spawn_faction_adddup2.c +++ b/lib/spawn_faction_adddup2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c index cabadf7..5b62142 100644 --- a/lib/spawn_faction_addopen.c +++ b/lib/spawn_faction_addopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn_faction_destroy.c b/lib/spawn_faction_destroy.c index f93c4ec..1b20ef6 100644 --- a/lib/spawn_faction_destroy.c +++ b/lib/spawn_faction_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn_faction_init.c b/lib/spawn_faction_init.c index 8de0325..6bd628c 100644 --- a/lib/spawn_faction_init.c +++ b/lib/spawn_faction_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawn_int.h b/lib/spawn_int.h index 3df5f11..909122e 100644 --- a/lib/spawn_int.h +++ b/lib/spawn_int.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2008-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawnattr_destroy.c b/lib/spawnattr_destroy.c index f408838..57cc89b 100644 --- a/lib/spawnattr_destroy.c +++ b/lib/spawnattr_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawnattr_init.c b/lib/spawnattr_init.c index 0cbf61c..954c377 100644 --- a/lib/spawnattr_init.c +++ b/lib/spawnattr_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawnattr_setflags.c b/lib/spawnattr_setflags.c index 4c1c017..c4e06c2 100644 --- a/lib/spawnattr_setflags.c +++ b/lib/spawnattr_setflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2004, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2004, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawnattr_setsigmask.c b/lib/spawnattr_setsigmask.c index ad10707..e9d7526 100644 --- a/lib/spawnattr_setsigmask.c +++ b/lib/spawnattr_setsigmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawni.c b/lib/spawni.c index 811d309..ab77dfe 100644 --- a/lib/spawni.c +++ b/lib/spawni.c @@ -1,5 +1,5 @@ /* Guts of POSIX spawn interface. Generic POSIX.1 version. - Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/spawnp.c b/lib/spawnp.c index b0d8bbe..dcb4d29 100644 --- a/lib/spawnp.c +++ b/lib/spawnp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/stat-time.h b/lib/stat-time.h index 9402b3f..104f537 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,13 +13,17 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ #ifndef STAT_TIME_H #define STAT_TIME_H 1 +#include "intprops.h" + +#include +#include #include #include @@ -31,6 +35,10 @@ _GL_INLINE_HEADER_BEGIN # define _GL_STAT_TIME_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type struct timespec, if available. If not, then STAT_TIMESPEC_NS (ST, ST_XTIM) is the nanosecond component of the ST_XTIM member for *ST, @@ -39,8 +47,8 @@ _GL_INLINE_HEADER_BEGIN time respectively. These macros are private to stat-time.h. */ -#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC -# ifdef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC +#if _GL_WINDOWS_STAT_TIMESPEC || defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC +# if _GL_WINDOWS_STAT_TIMESPEC || defined TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim) # else # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec) @@ -94,15 +102,13 @@ get_stat_mtime_ns (struct stat const *st) /* Return the nanosecond component of *ST's birth time. */ _GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE -get_stat_birthtime_ns (struct stat const *st) +get_stat_birthtime_ns (struct stat const *st _GL_UNUSED) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC return STAT_TIMESPEC (st, st_birthtim).tv_nsec; # elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC return STAT_TIMESPEC_NS (st, st_birthtim); # else - /* Avoid a "parameter unused" warning. */ - (void) st; return 0; # endif } @@ -152,7 +158,7 @@ get_stat_mtime (struct stat const *st) /* Return *ST's birth time, if available; otherwise return a value with tv_sec and tv_nsec both equal to -1. */ _GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE -get_stat_birthtime (struct stat const *st) +get_stat_birthtime (struct stat const *st _GL_UNUSED) { struct timespec t; @@ -165,15 +171,17 @@ get_stat_birthtime (struct stat const *st) #elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* Native Windows platforms (but not Cygwin) put the "file creation time" in st_ctime (!). See - . */ + . */ +# if _GL_WINDOWS_STAT_TIMESPEC + t = st->st_ctim; +# else t.tv_sec = st->st_ctime; t.tv_nsec = 0; +# endif #else /* Birth time is not supported. */ t.tv_sec = -1; t.tv_nsec = -1; - /* Avoid a "parameter unused" warning. */ - (void) st; #endif #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \ @@ -194,6 +202,51 @@ get_stat_birthtime (struct stat const *st) return t; } +/* If a stat-like function returned RESULT, normalize the timestamps + in *ST, in case this platform suffers from the Solaris 11 bug where + tv_nsec might be negative. Return the adjusted RESULT, setting + errno to EOVERFLOW if normalization overflowed. This function + is intended to be private to this .h file. */ +_GL_STAT_TIME_INLINE int +stat_time_normalize (int result, struct stat *st _GL_UNUSED) +{ +#if defined __sun && defined STAT_TIMESPEC + if (result == 0) + { + long int timespec_resolution = 1000000000; + short int const ts_off[] = { offsetof (struct stat, st_atim), + offsetof (struct stat, st_mtim), + offsetof (struct stat, st_ctim) }; + int i; + for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++) + { + struct timespec *ts = (struct timespec *) ((char *) st + ts_off[i]); + long int q = ts->tv_nsec / timespec_resolution; + long int r = ts->tv_nsec % timespec_resolution; + if (r < 0) + { + r += timespec_resolution; + q--; + } + ts->tv_nsec = r; + /* Overflow is possible, as Solaris 11 stat can yield + tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. + INT_ADD_WRAPV is OK, since time_t is signed on Solaris. */ + if (INT_ADD_WRAPV (q, ts->tv_sec, &ts->tv_sec)) + { + errno = EOVERFLOW; + return -1; + } + } + } +#endif + return result; +} + +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif diff --git a/lib/stat-w32.c b/lib/stat-w32.c new file mode 100644 index 0000000..5d76a46 --- /dev/null +++ b/lib/stat-w32.c @@ -0,0 +1,421 @@ +/* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible. */ + +#include + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +/* Ensure that defines FILE_ID_INFO. */ +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN8 + +#include +#include +#include +#include +#include +#include +#include + +/* Specification. */ +#include "stat-w32.h" + +#include "pathmax.h" +#include "verify.h" + +#if _GL_WINDOWS_STAT_INODES == 2 +/* GetFileInformationByHandleEx was introduced only in Windows Vista. */ +typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile, + FILE_INFO_BY_HANDLE_CLASS fiClass, + LPVOID lpBuffer, + DWORD dwBufferSize); +static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL; +#endif +/* GetFinalPathNameByHandle was introduced only in Windows Vista. */ +typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile, + LPTSTR lpFilePath, + DWORD lenFilePath, + DWORD dwFlags); +static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL; +static BOOL initialized = FALSE; + +static void +initialize (void) +{ + HMODULE kernel32 = LoadLibrary ("kernel32.dll"); + if (kernel32 != NULL) + { +#if _GL_WINDOWS_STAT_INODES == 2 + GetFileInformationByHandleExFunc = + (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx"); +#endif + GetFinalPathNameByHandleFunc = + (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA"); + } + initialized = TRUE; +} + +/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ +#if _GL_WINDOWS_STAT_TIMESPEC +struct timespec +_gl_convert_FILETIME_to_timespec (const FILETIME *ft) +{ + struct timespec result; + /* FILETIME: */ + unsigned long long since_1601 = + ((unsigned long long) ft->dwHighDateTime << 32) + | (unsigned long long) ft->dwLowDateTime; + if (since_1601 == 0) + { + result.tv_sec = 0; + result.tv_nsec = 0; + } + else + { + /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 + leap years, in total 134774 days. */ + unsigned long long since_1970 = + since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; + result.tv_sec = since_1970 / (unsigned long long) 10000000; + result.tv_nsec = (unsigned long) (since_1970 % (unsigned long long) 10000000) * 100; + } + return result; +} +#else +time_t +_gl_convert_FILETIME_to_POSIX (const FILETIME *ft) +{ + /* FILETIME: */ + unsigned long long since_1601 = + ((unsigned long long) ft->dwHighDateTime << 32) + | (unsigned long long) ft->dwLowDateTime; + if (since_1601 == 0) + return 0; + else + { + /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 + leap years, in total 134774 days. */ + unsigned long long since_1970 = + since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; + return since_1970 / (unsigned long long) 10000000; + } +} +#endif + +/* Fill *BUF with information about the file designated by H. + PATH is the file name, if known, otherwise NULL. + Return 0 if successful, or -1 with errno set upon failure. */ +int +_gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) +{ + /* GetFileType + */ + DWORD type = GetFileType (h); + if (type == FILE_TYPE_DISK) + { + if (!initialized) + initialize (); + + /* st_mode can be determined through + GetFileAttributesEx + + + or through + GetFileInformationByHandle + + + or through + GetFileInformationByHandleEx with argument FileBasicInfo + + + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + BY_HANDLE_FILE_INFORMATION info; + if (! GetFileInformationByHandle (h, &info)) + goto failed; + + /* Test for error conditions before starting to fill *buf. */ + if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) + { + errno = EOVERFLOW; + return -1; + } + +#if _GL_WINDOWS_STAT_INODES + /* st_ino can be determined through + GetFileInformationByHandle + + + as 64 bits, or through + GetFileInformationByHandleEx with argument FileIdInfo + + + as 128 bits. + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_WIN8 or higher. */ + /* Experiments show that GetFileInformationByHandleEx does not provide + much more information than GetFileInformationByHandle: + * The dwVolumeSerialNumber from GetFileInformationByHandle is equal + to the low 32 bits of the 64-bit VolumeSerialNumber from + GetFileInformationByHandleEx, and is apparently sufficient for + identifying the device. + * The nFileIndex from GetFileInformationByHandle is equal to the low + 64 bits of the 128-bit FileId from GetFileInformationByHandleEx, + and the high 64 bits of this 128-bit FileId are zero. + * On a FAT file system, GetFileInformationByHandleEx fails with error + ERROR_INVALID_PARAMETER, whereas GetFileInformationByHandle + succeeds. + * On a CIFS/SMB file system, GetFileInformationByHandleEx fails with + error ERROR_INVALID_LEVEL, whereas GetFileInformationByHandle + succeeds. */ +# if _GL_WINDOWS_STAT_INODES == 2 + if (GetFileInformationByHandleExFunc != NULL) + { + FILE_ID_INFO id; + if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) + { + buf->st_dev = id.VolumeSerialNumber; + verify (sizeof (ino_t) == sizeof (id.FileId)); + memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); + goto ino_done; + } + else + { + switch (GetLastError ()) + { + case ERROR_INVALID_PARAMETER: /* older Windows version, or FAT */ + case ERROR_INVALID_LEVEL: /* CIFS/SMB file system */ + goto fallback; + default: + goto failed; + } + } + } + fallback: ; + /* Fallback for older Windows versions. */ + buf->st_dev = info.dwVolumeSerialNumber; + buf->st_ino._gl_ino[0] = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; + buf->st_ino._gl_ino[1] = 0; + ino_done: ; +# else /* _GL_WINDOWS_STAT_INODES == 1 */ + buf->st_dev = info.dwVolumeSerialNumber; + buf->st_ino = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; +# endif +#else + /* st_ino is not wide enough for identifying a file on a device. + Without st_ino, st_dev is pointless. */ + buf->st_dev = 0; + buf->st_ino = 0; +#endif + + /* st_mode. */ + unsigned int mode = + /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ + ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) + | S_IREAD_UGO + | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); + if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + /* Determine whether the file is executable by looking at the file + name suffix. + If the file name is already known, use it. Otherwise, for + non-empty files, it can be determined through + GetFinalPathNameByHandle + + or through + GetFileInformationByHandleEx with argument FileNameInfo + + + Both require -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) + { + char fpath[PATH_MAX]; + if (path != NULL + || (GetFinalPathNameByHandleFunc != NULL + && GetFinalPathNameByHandleFunc (h, fpath, sizeof (fpath), VOLUME_NAME_NONE) + < sizeof (fpath) + && (path = fpath, 1))) + { + const char *last_dot = NULL; + const char *p; + for (p = path; *p != '\0'; p++) + if (*p == '.') + last_dot = p; + if (last_dot != NULL) + { + const char *suffix = last_dot + 1; + if (_stricmp (suffix, "exe") == 0 + || _stricmp (suffix, "bat") == 0 + || _stricmp (suffix, "cmd") == 0 + || _stricmp (suffix, "com") == 0) + mode |= S_IEXEC_UGO; + } + } + else + /* Cannot determine file name. Pretend that it is executable. */ + mode |= S_IEXEC_UGO; + } + } + buf->st_mode = mode; + + /* st_nlink can be determined through + GetFileInformationByHandle + + + or through + GetFileInformationByHandleEx with argument FileStandardInfo + + + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + buf->st_nlink = (info.nNumberOfLinks > SHRT_MAX ? SHRT_MAX : info.nNumberOfLinks); + + /* There's no easy way to map the Windows SID concept to an integer. */ + buf->st_uid = 0; + buf->st_gid = 0; + + /* st_rdev is irrelevant for normal files and directories. */ + buf->st_rdev = 0; + + /* st_size can be determined through + GetFileSizeEx + + or through + GetFileAttributesEx + + + or through + GetFileInformationByHandle + + + or through + GetFileInformationByHandleEx with argument FileStandardInfo + + + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + if (sizeof (buf->st_size) <= 4) + /* Range check already done above. */ + buf->st_size = info.nFileSizeLow; + else + buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; + + /* st_atime, st_mtime, st_ctime can be determined through + GetFileTime + + or through + GetFileAttributesEx + + + or through + GetFileInformationByHandle + + + or through + GetFileInformationByHandleEx with argument FileBasicInfo + + + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ +#if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); + buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); + buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); +#else + buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); + buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); + buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); +#endif + + return 0; + } + else if (type == FILE_TYPE_CHAR || type == FILE_TYPE_PIPE) + { + buf->st_dev = 0; +#if _GL_WINDOWS_STAT_INODES == 2 + buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; +#else + buf->st_ino = 0; +#endif + buf->st_mode = (type == FILE_TYPE_PIPE ? _S_IFIFO : _S_IFCHR); + buf->st_nlink = 1; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_rdev = 0; + if (type == FILE_TYPE_PIPE) + { + /* PeekNamedPipe + */ + DWORD bytes_available; + if (PeekNamedPipe (h, NULL, 0, NULL, &bytes_available, NULL)) + buf->st_size = bytes_available; + else + buf->st_size = 0; + } + else + buf->st_size = 0; +#if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim.tv_sec = 0; buf->st_atim.tv_nsec = 0; + buf->st_mtim.tv_sec = 0; buf->st_mtim.tv_nsec = 0; + buf->st_ctim.tv_sec = 0; buf->st_ctim.tv_nsec = 0; +#else + buf->st_atime = 0; + buf->st_mtime = 0; + buf->st_ctime = 0; +#endif + return 0; + } + else + { + errno = ENOENT; + return -1; + } + + failed: + { + DWORD error = GetLastError (); + #if 0 + fprintf (stderr, "_gl_fstat_by_handle error 0x%x\n", (unsigned int) error); + #endif + switch (error) + { + case ERROR_ACCESS_DENIED: + case ERROR_SHARING_VIOLATION: + errno = EACCES; + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + default: + errno = EINVAL; + break; + } + return -1; + } +} + +#else + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; + +#endif diff --git a/lib/stat-w32.h b/lib/stat-w32.h new file mode 100644 index 0000000..9a3ecc1 --- /dev/null +++ b/lib/stat-w32.h @@ -0,0 +1,37 @@ +/* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 _STAT_W32_H +#define _STAT_W32_H 1 + +/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ +#if _GL_WINDOWS_STAT_TIMESPEC +extern struct timespec _gl_convert_FILETIME_to_timespec (const FILETIME *ft); +#else +extern time_t _gl_convert_FILETIME_to_POSIX (const FILETIME *ft); +#endif + +/* Fill *BUF with information about the file designated by H. + PATH is the file name, if known, otherwise NULL. + Return 0 if successful, or -1 with errno set upon failure. */ +extern int _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf); + +/* Bitmasks for st_mode. */ +#define S_IREAD_UGO (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) +#define S_IWRITE_UGO (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) +#define S_IEXEC_UGO (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6)) + +#endif /* _STAT_W32_H */ diff --git a/lib/stat.c b/lib/stat.c index 7e7c2f6..1c5b62e 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,9 +12,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ -/* written by Eric Blake */ +/* Written by Eric Blake and Bruno Haible. */ /* If the user's config.h happens to include , let it include only the system's here, so that orig_stat doesn't recurse to @@ -28,46 +28,67 @@ #undef __need_system_sys_stat_h #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# if _GL_WINDOWS_64_BIT_ST_SIZE -# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define stat _stati64 -# define REPLACE_FUNC_STAT_DIR 1 -# undef REPLACE_FUNC_STAT_FILE -# elif REPLACE_FUNC_STAT_FILE -/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a. - Bypass it. */ -# define stat _stat -# define REPLACE_FUNC_STAT_DIR 1 -# undef REPLACE_FUNC_STAT_FILE -# endif +# define WINDOWS_NATIVE #endif +#if !defined WINDOWS_NATIVE + static int orig_stat (const char *filename, struct stat *buf) { return stat (filename, buf); } +#endif + /* Specification. */ /* Write "sys/stat.h" here, not , otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include above. */ #include "sys/stat.h" +#include "stat-time.h" + #include #include #include #include -#include "dosname.h" +#include "filename.h" +#include "malloca.h" #include "verify.h" -#if REPLACE_FUNC_STAT_DIR -# include "pathmax.h" - /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also - have a constant PATH_MAX. */ -# ifndef PATH_MAX -# error "Please port this replacement to your platform" -# endif +#ifdef WINDOWS_NATIVE +# define WIN32_LEAN_AND_MEAN +# include +# include "stat-w32.h" +#endif + +#ifdef WINDOWS_NATIVE +/* Return TRUE if the given file name denotes an UNC root. */ +static BOOL +is_unc_root (const char *rname) +{ + /* Test whether it has the syntax '\\server\share'. */ + if (ISSLASH (rname[0]) && ISSLASH (rname[1])) + { + /* It starts with two slashes. Find the next slash. */ + const char *p = rname + 2; + const char *q = p; + while (*q != '\0' && !ISSLASH (*q)) + q++; + if (q > p && *q != '\0') + { + /* Found the next slash at q. */ + q++; + const char *r = q; + while (*r != '\0' && !ISSLASH (*r)) + r++; + if (r > q && *r == '\0') + return TRUE; + } + } + return FALSE; +} #endif /* Store information about NAME into ST. Work around bugs with @@ -77,62 +98,332 @@ orig_stat (const char *filename, struct stat *buf) correctly. */ int -rpl_stat (char const *name, struct stat *st) +rpl_stat (char const *name, struct stat *buf) { - int result = orig_stat (name, st); -#if REPLACE_FUNC_STAT_FILE - /* Solaris 9 mistakenly succeeds when given a non-directory with a - trailing slash. */ - if (result == 0 && !S_ISDIR (st->st_mode)) +#ifdef WINDOWS_NATIVE + /* Fill the fields ourselves, because the original stat function returns + values for st_atime, st_mtime, st_ctime that depend on the current time + zone. See + */ + /* XXX Should we convert to wchar_t* and prepend '\\?\', in order to work + around length limitations + ? */ + + /* POSIX + specifies: "More than two leading characters shall be treated as + a single character." */ + if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) + { + name += 2; + while (ISSLASH (name[1])) + name++; + } + + size_t len = strlen (name); + size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0); + + /* Remove trailing slashes (except the very first one, at position + drive_prefix_len), but remember their presence. */ + size_t rlen; + bool check_dir = false; + + rlen = len; + while (rlen > drive_prefix_len && ISSLASH (name[rlen-1])) { - size_t len = strlen (name); - if (ISSLASH (name[len - 1])) + check_dir = true; + if (rlen == drive_prefix_len + 1) + break; + rlen--; + } + + /* Handle '' and 'C:'. */ + if (!check_dir && rlen == drive_prefix_len) + { + errno = ENOENT; + return -1; + } + + /* Handle '\\'. */ + if (rlen == 1 && ISSLASH (name[0]) && len >= 2) + { + errno = ENOENT; + return -1; + } + + const char *rname; + char *malloca_rname; + if (rlen == len) + { + rname = name; + malloca_rname = NULL; + } + else + { + malloca_rname = malloca (rlen + 1); + if (malloca_rname == NULL) { - errno = ENOTDIR; + errno = ENOMEM; return -1; } + memcpy (malloca_rname, name, rlen); + malloca_rname[rlen] = '\0'; + rname = malloca_rname; } -#endif /* REPLACE_FUNC_STAT_FILE */ -#if REPLACE_FUNC_STAT_DIR - if (result == -1 && errno == ENOENT) + /* There are two ways to get at the requested information: + - by scanning the parent directory and examining the relevant + directory entry, + - by opening the file directly. + The first approach fails for root directories (e.g. 'C:\') and + UNC root directories (e.g. '\\server\share'). + The second approach fails for some system files (e.g. 'C:\pagefile.sys' + and 'C:\hiberfil.sys'): ERROR_SHARING_VIOLATION. + The second approach gives more information (in particular, correct + st_dev, st_ino, st_nlink fields). + So we use the second approach and, as a fallback except for root and + UNC root directories, also the first approach. */ + { + int ret; + { - /* Due to mingw's oddities, there are some directories (like - c:\) where stat() only succeeds with a trailing slash, and - other directories (like c:\windows) where stat() only - succeeds without a trailing slash. But we want the two to be - synonymous, since chdir() manages either style. Likewise, Mingw also - reports ENOENT for names longer than PATH_MAX, when we want - ENAMETOOLONG, and for stat("file/"), when we want ENOTDIR. - Fortunately, mingw PATH_MAX is small enough for stack - allocation. */ - char fixed_name[PATH_MAX + 1] = {0}; - size_t len = strlen (name); - bool check_dir = false; - verify (PATH_MAX <= 4096); - if (PATH_MAX <= len) - errno = ENAMETOOLONG; - else if (len) + /* Approach based on the file. */ + + /* Open a handle to the file. + CreateFile + + */ + HANDLE h = + CreateFile (rname, + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only + in case as different) makes sense only when applied to *all* + filesystem operations. */ + FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, + NULL); + if (h != INVALID_HANDLE_VALUE) + { + ret = _gl_fstat_by_handle (h, rname, buf); + CloseHandle (h); + goto done; + } + } + + /* Test for root and UNC root directories. */ + if ((rlen == drive_prefix_len + 1 && ISSLASH (rname[drive_prefix_len])) + || is_unc_root (rname)) + goto failed; + + /* Fallback. */ + { + /* Approach based on the directory entry. */ + + if (strchr (rname, '?') != NULL || strchr (rname, '*') != NULL) + { + /* Other Windows API functions would fail with error + ERROR_INVALID_NAME. */ + if (malloca_rname != NULL) + freea (malloca_rname); + errno = ENOENT; + return -1; + } + + /* Get the details about the directory entry. This can be done through + FindFirstFile + + + or through + FindFirstFileEx with argument FindExInfoBasic + + + */ + WIN32_FIND_DATA info; + HANDLE h = FindFirstFile (rname, &info); + if (h == INVALID_HANDLE_VALUE) + goto failed; + + /* Test for error conditions before starting to fill *buf. */ + if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) + { + FindClose (h); + if (malloca_rname != NULL) + freea (malloca_rname); + errno = EOVERFLOW; + return -1; + } + +# if _GL_WINDOWS_STAT_INODES + buf->st_dev = 0; +# if _GL_WINDOWS_STAT_INODES == 2 + buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; +# else /* _GL_WINDOWS_STAT_INODES == 1 */ + buf->st_ino = 0; +# endif +# else + /* st_ino is not wide enough for identifying a file on a device. + Without st_ino, st_dev is pointless. */ + buf->st_dev = 0; + buf->st_ino = 0; +# endif + + /* st_mode. */ + unsigned int mode = + /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ + ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) + | S_IREAD_UGO + | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); + if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy (fixed_name, name); - if (ISSLASH (fixed_name[len - 1])) + /* Determine whether the file is executable by looking at the file + name suffix. */ + if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) { - check_dir = true; - while (len && ISSLASH (fixed_name[len - 1])) - fixed_name[--len] = '\0'; - if (!len) - fixed_name[0] = '/'; + const char *last_dot = NULL; + const char *p; + for (p = info.cFileName; *p != '\0'; p++) + if (*p == '.') + last_dot = p; + if (last_dot != NULL) + { + const char *suffix = last_dot + 1; + if (_stricmp (suffix, "exe") == 0 + || _stricmp (suffix, "bat") == 0 + || _stricmp (suffix, "cmd") == 0 + || _stricmp (suffix, "com") == 0) + mode |= S_IEXEC_UGO; + } } - else - fixed_name[len++] = '/'; - result = orig_stat (fixed_name, st); - if (result == 0 && check_dir && !S_ISDIR (st->st_mode)) + } + buf->st_mode = mode; + + /* st_nlink. Ignore hard links here. */ + buf->st_nlink = 1; + + /* There's no easy way to map the Windows SID concept to an integer. */ + buf->st_uid = 0; + buf->st_gid = 0; + + /* st_rdev is irrelevant for normal files and directories. */ + buf->st_rdev = 0; + + /* st_size. */ + if (sizeof (buf->st_size) <= 4) + /* Range check already done above. */ + buf->st_size = info.nFileSizeLow; + else + buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; + + /* st_atime, st_mtime, st_ctime. */ +# if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); + buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); + buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); +# else + buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); + buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); + buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); +# endif + + FindClose (h); + + ret = 0; + } + + done: + if (ret >= 0 && check_dir && !S_ISDIR (buf->st_mode)) + { + errno = ENOTDIR; + ret = -1; + } + if (malloca_rname != NULL) + { + int saved_errno = errno; + freea (malloca_rname); + errno = saved_errno; + } + return ret; + } + + failed: + { + DWORD error = GetLastError (); + #if 0 + fprintf (stderr, "rpl_stat error 0x%x\n", (unsigned int) error); + #endif + + if (malloca_rname != NULL) + freea (malloca_rname); + + switch (error) + { + /* Some of these errors probably cannot happen with the specific flags + that we pass to CreateFile. But who knows... */ + case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist. */ + case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist. */ + case ERROR_BAD_PATHNAME: /* rname is such as '\\server'. */ + case ERROR_BAD_NET_NAME: /* rname is such as '\\server\nonexistentshare'. */ + case ERROR_INVALID_NAME: /* rname contains wildcards, misplaced colon, etc. */ + case ERROR_DIRECTORY: + errno = ENOENT; + break; + + case ERROR_ACCESS_DENIED: /* rname is such as 'C:\System Volume Information\foo'. */ + case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys' (second approach only). */ + /* XXX map to EACCESS or EPERM? */ + errno = EACCES; + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_WRITE_PROTECT: + errno = EROFS; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + case ERROR_BUFFER_OVERFLOW: + case ERROR_FILENAME_EXCED_RANGE: + errno = ENAMETOOLONG; + break; + + case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ + errno = EPERM; + break; + + default: + errno = EINVAL; + break; + } + + return -1; + } +#else + int result = orig_stat (name, buf); + if (result == 0) + { +# if REPLACE_FUNC_STAT_FILE + /* Solaris 9 mistakenly succeeds when given a non-directory with a + trailing slash. */ + if (!S_ISDIR (buf->st_mode)) + { + size_t len = strlen (name); + if (ISSLASH (name[len - 1])) { - result = -1; errno = ENOTDIR; + return -1; } } +# endif /* REPLACE_FUNC_STAT_FILE */ + result = stat_time_normalize (result, buf); } -#endif /* REPLACE_FUNC_STAT_DIR */ return result; +#endif } diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index 5f56eee..bbfa9ac 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C11 . - Copyright 2011-2017 Free Software Foundation, Inc. + Copyright 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Paul Eggert and Bruno Haible. */ @@ -53,7 +53,7 @@ #undef _Alignof /* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 - . */ + . */ #if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9))) # ifdef __cplusplus @@ -103,7 +103,7 @@ # elif ((defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || 061200 <= __HP_cc || 061200 <= __HP_aCC \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index 1067ed2..ebf1a2f 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _GL_STDBOOL_H #define _GL_STDBOOL_H @@ -82,9 +82,9 @@ typedef bool _Bool; /* If @HAVE__BOOL@: Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when the built-in _Bool type is used. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + https://lists.gnu.org/r/bug-coreutils/2005-10/msg00086.html Similar bugs are likely with other compilers as well; this file wouldn't be used if was working. So we override the _Bool type. diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 5b496a6..8329a9b 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Eric Blake. */ @@ -85,24 +85,28 @@ a hack in case the configure-time test was done with g++ even though we are currently compiling with gcc. */ #if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) +# if !GNULIB_defined_max_align_t /* On the x86, the maximum storage alignment of double, long, etc. is 4, but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, and the C11 standard allows this. Work around this problem by using __alignof__ (which returns 8 for double) rather than _Alignof (which returns 4), and align each union member accordingly. */ -# ifdef __GNUC__ -# define _GL_STDDEF_ALIGNAS(type) \ - __attribute__ ((__aligned__ (__alignof__ (type)))) -# else -# define _GL_STDDEF_ALIGNAS(type) /* */ -# endif +# ifdef __GNUC__ +# define _GL_STDDEF_ALIGNAS(type) \ + __attribute__ ((__aligned__ (__alignof__ (type)))) +# else +# define _GL_STDDEF_ALIGNAS(type) /* */ +# endif typedef union { char *__p _GL_STDDEF_ALIGNAS (char *); double __d _GL_STDDEF_ALIGNAS (double); long double __ld _GL_STDDEF_ALIGNAS (long double); long int __i _GL_STDDEF_ALIGNAS (long int); -} max_align_t; +} rpl_max_align_t; +# define max_align_t rpl_max_align_t +# define GNULIB_defined_max_align_t 1 +# endif #endif # endif /* _@GUARD_PREFIX@_STDDEF_H */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index d899c1e..94e7c81 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2018 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* * ISO C 99 for platforms that lack it. @@ -128,8 +128,13 @@ Return an unspecified value if BITS == 0, adding a check to pacify picky compilers. */ -# define _STDINT_MIN(signed, bits, zero) \ - ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero)) +/* These are separate macros, because if you try to merge these macros into + a single one, HP-UX cc rejects the resulting expression in constant + expressions. */ +# define _STDINT_UNSIGNED_MIN(bits, zero) \ + (zero) +# define _STDINT_SIGNED_MIN(bits, zero) \ + (~ _STDINT_MAX (1, bits, zero)) # define _STDINT_MAX(signed, bits, zero) \ (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) @@ -512,15 +517,15 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) # undef PTRDIFF_MAX # if @APPLE_UNIVERSAL_BUILD@ # ifdef _LP64 -# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) +# define PTRDIFF_MIN _STDINT_SIGNED_MIN (64, 0l) # define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) # else -# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) +# define PTRDIFF_MIN _STDINT_SIGNED_MIN (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@) + _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) # define PTRDIFF_MAX \ _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) # endif @@ -528,9 +533,13 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) /* sig_atomic_t limits */ # undef SIG_ATOMIC_MIN # undef SIG_ATOMIC_MAX -# define SIG_ATOMIC_MIN \ - _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ - 0@SIG_ATOMIC_T_SUFFIX@) +# if @HAVE_SIGNED_SIG_ATOMIC_T@ +# define SIG_ATOMIC_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) +# else +# define SIG_ATOMIC_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) +# endif # define SIG_ATOMIC_MAX \ _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ 0@SIG_ATOMIC_T_SUFFIX@) @@ -566,16 +575,26 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) # endif # undef WCHAR_MIN # undef WCHAR_MAX -# define WCHAR_MIN \ - _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +# if @HAVE_SIGNED_WCHAR_T@ +# define WCHAR_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +# else +# define WCHAR_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +# endif # define WCHAR_MAX \ _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) /* wint_t limits */ # undef WINT_MIN # undef WINT_MAX -# define WINT_MIN \ - _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +# if @HAVE_SIGNED_WINT_T@ +# define WINT_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +# else +# define WINT_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +# endif # define WINT_MAX \ _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 75a945e..78d896e 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -1,5 +1,5 @@ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Many stdio implementations have the same logic and therefore can share the same implementation of stdio extension API, except that some fields @@ -32,7 +32,7 @@ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ # if defined __DragonFly__ /* DragonFly */ - /* See . */ + /* See . */ # define fp_ ((struct { struct __FILE_public pub; \ struct { unsigned char *_base; int _size; } _bf; \ void *cookie; \ @@ -49,7 +49,7 @@ fpos_t _offset; \ /* More fields, not relevant here. */ \ } *) fp) - /* See . */ + /* See . */ # define _p pub._p # define _flags pub._flags # define _r pub._r @@ -60,7 +60,7 @@ # if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Minix 3, Android */ /* See - and */ + and */ struct __sfileext { struct __sbuf _ub; /* ungetc buffer */ @@ -81,7 +81,7 @@ #ifdef __TANDEM /* NonStop Kernel */ # ifndef _IOERR /* These values were determined by the program 'stdioext-flags' at - . */ + . */ # define _IOERR 0x40 # define _IOREAD 0x80 # define _IOWRT 0x4 @@ -99,6 +99,8 @@ int _file; \ unsigned int _flag; \ } *) fp) +# elif defined __VMS /* OpenVMS */ +# define fp_ ((struct _iobuf *) fp) # else # define fp_ fp # endif @@ -130,7 +132,7 @@ struct _gl_real_FILE # define fp_ ((struct _gl_real_FILE *) fp) /* These values were determined by a program similar to the one at - . */ + . */ # define _IOREAD 0x1 # define _IOWRT 0x2 # define _IORW 0x4 diff --git a/lib/stdio-write.c b/lib/stdio-write.c index 8ad693b..5bd8d63 100644 --- a/lib/stdio-write.c +++ b/lib/stdio-write.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream write function. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -39,7 +39,11 @@ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif # if GNULIB_NONBLOCKING # define CLEAR_ERRNO \ diff --git a/lib/stdio.in.h b/lib/stdio.in.h index d706377..b9a43bb 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -111,9 +111,9 @@ #define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument)) -/* Solaris 10 declares renameat in , not in . */ +/* Solaris 10 and NetBSD 7.0 declare renameat in , not in . */ /* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && (defined __sun || defined __NetBSD__) \ && ! defined __GLIBC__ # include #endif @@ -152,7 +152,7 @@ /* When also using extern inline, suppress the use of static inline in standard headers of problematic Apple configurations, as Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., - . + . Perhaps Apple will fix this some day. */ #if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ && defined __GNUC__ && defined __STDC__) @@ -610,7 +610,7 @@ _GL_CXXALIAS_SYS (fwrite, size_t, (const void *ptr, size_t s, size_t n, FILE *stream)); /* Work around bug 11959 when fortifying glibc 2.4 through 2.15 - , + , which sometimes causes an unwanted diagnostic for fwrite calls. This affects only function declaration attributes under certain versions of gcc and clang, and is not needed for C++. */ diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index b5cf9d3..b9701d5 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -597,7 +597,7 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - " #endif #if @GNULIB_RANDOM@ -# if !@HAVE_RANDOM@ +# if !@HAVE_RANDOM@ || !@HAVE_DECL_INITSTATE@ _GL_FUNCDECL_SYS (initstate, char *, (unsigned int seed, char *buf, size_t buf_size) _GL_ARG_NONNULL ((2))); @@ -614,7 +614,7 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - " #endif #if @GNULIB_RANDOM@ -# if !@HAVE_RANDOM@ +# if !@HAVE_RANDOM@ || !@HAVE_DECL_SETSTATE@ _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (setstate, char *, (char *arg_state)); @@ -765,6 +765,23 @@ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " "use gnulib module realloc-posix for portability"); #endif + +#if @GNULIB_REALLOCARRAY@ +# if ! @HAVE_REALLOCARRAY@ +_GL_FUNCDECL_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +# endif +_GL_CXXALIAS_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +_GL_CXXALIASWARN (reallocarray); +#elif defined GNULIB_POSIXCHECK +# undef reallocarray +# if HAVE_RAW_DECL_REALLOCARRAY +_GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - " + "use gnulib module reallocarray for portability"); +# endif +#endif + #if @GNULIB_REALPATH@ # if @REPLACE_REALPATH@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/lib/str-two-way.h b/lib/str-two-way.h index 8b02f94..85489d1 100644 --- a/lib/str-two-way.h +++ b/lib/str-two-way.h @@ -1,5 +1,5 @@ /* Byte-wise substring search, using the Two-Way algorithm. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake , 2008. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* Before including this file, you need to include and , and define: @@ -50,8 +50,8 @@ achieve improved (potentially sub-linear) performance. See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260, - http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm, - http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf + https://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm, + https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf */ /* Point at which computing a bad-byte shift table is likely to be diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c index 8548f4d..49f22c5 100644 --- a/lib/strcasecmp.c +++ b/lib/strcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/strchrnul.c b/lib/strchrnul.c index 2d40658..8b3cd88 100644 --- a/lib/strchrnul.c +++ b/lib/strchrnul.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/strdup.c b/lib/strdup.c index 0c096e3..ce43940 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2017 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _LIBC # include diff --git a/lib/streq.h b/lib/streq.h index d40fc48..bde1b95 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible . */ diff --git a/lib/strerror-override.c b/lib/strerror-override.c index fb2c74f..d3ad21e 100644 --- a/lib/strerror-override.c +++ b/lib/strerror-override.c @@ -1,6 +1,6 @@ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2010-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible , 2010. */ diff --git a/lib/strerror-override.h b/lib/strerror-override.h index c22d303..a96fd08 100644 --- a/lib/strerror-override.h +++ b/lib/strerror-override.h @@ -1,6 +1,6 @@ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2010-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _GL_STRERROR_OVERRIDE_H # define _GL_STRERROR_OVERRIDE_H diff --git a/lib/strerror.c b/lib/strerror.c index afeb9c8..36397bb 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/strerror_r.c b/lib/strerror_r.c index 09ec8d9..c556c26 100644 --- a/lib/strerror_r.c +++ b/lib/strerror_r.c @@ -1,6 +1,6 @@ /* strerror_r.c --- POSIX compatible system error routine - Copyright (C) 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2010-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Bruno Haible , 2010. */ @@ -28,6 +28,9 @@ #include #include #include +#if !HAVE_SNPRINTF +# include +#endif #include "strerror-override.h" @@ -40,7 +43,7 @@ extern #endif int __xpg_strerror_r (int errnum, char *buf, size_t buflen); -#elif HAVE_DECL_STRERROR_R_ORIG && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) +#elif HAVE_DECL_STRERROR_R && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) /* The system's strerror_r function is OK, except that its third argument is 'int', not 'size_t', or its return type is wrong. */ @@ -209,13 +212,16 @@ strerror_r (int errnum, char *buf, size_t buflen) # else ret = strerror_r (errnum, buf, buflen); - /* Some old implementations may return (-1, EINVAL) instead of EINVAL. */ + /* Some old implementations may return (-1, EINVAL) instead of EINVAL. + But on Haiku, valid error numbers are negative. */ +# if !defined __HAIKU__ if (ret < 0) ret = errno; +# endif # endif -# ifdef _AIX - /* AIX returns 0 rather than ERANGE when truncating strings; try +# if defined _AIX || defined __HAIKU__ + /* AIX and Haiku return 0 rather than ERANGE when truncating strings; try again until we are sure we got the entire string. */ if (!ret && strlen (buf) == buflen - 1) { @@ -327,10 +333,126 @@ strerror_r (int errnum, char *buf, size_t buflen) # endif +#endif + +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* MSVC 14 defines names for many error codes in the range 100..140, + but _sys_errlist contains strings only for the error codes + < _sys_nerr = 43. */ + if (ret == EINVAL) + { + const char *errmsg; + + switch (errnum) + { + case 100 /* EADDRINUSE */: + errmsg = "Address already in use"; + break; + case 101 /* EADDRNOTAVAIL */: + errmsg = "Cannot assign requested address"; + break; + case 102 /* EAFNOSUPPORT */: + errmsg = "Address family not supported by protocol"; + break; + case 103 /* EALREADY */: + errmsg = "Operation already in progress"; + break; + case 105 /* ECANCELED */: + errmsg = "Operation canceled"; + break; + case 106 /* ECONNABORTED */: + errmsg = "Software caused connection abort"; + break; + case 107 /* ECONNREFUSED */: + errmsg = "Connection refused"; + break; + case 108 /* ECONNRESET */: + errmsg = "Connection reset by peer"; + break; + case 109 /* EDESTADDRREQ */: + errmsg = "Destination address required"; + break; + case 110 /* EHOSTUNREACH */: + errmsg = "No route to host"; + break; + case 112 /* EINPROGRESS */: + errmsg = "Operation now in progress"; + break; + case 113 /* EISCONN */: + errmsg = "Transport endpoint is already connected"; + break; + case 114 /* ELOOP */: + errmsg = "Too many levels of symbolic links"; + break; + case 115 /* EMSGSIZE */: + errmsg = "Message too long"; + break; + case 116 /* ENETDOWN */: + errmsg = "Network is down"; + break; + case 117 /* ENETRESET */: + errmsg = "Network dropped connection on reset"; + break; + case 118 /* ENETUNREACH */: + errmsg = "Network is unreachable"; + break; + case 119 /* ENOBUFS */: + errmsg = "No buffer space available"; + break; + case 123 /* ENOPROTOOPT */: + errmsg = "Protocol not available"; + break; + case 126 /* ENOTCONN */: + errmsg = "Transport endpoint is not connected"; + break; + case 128 /* ENOTSOCK */: + errmsg = "Socket operation on non-socket"; + break; + case 129 /* ENOTSUP */: + errmsg = "Not supported"; + break; + case 130 /* EOPNOTSUPP */: + errmsg = "Operation not supported"; + break; + case 132 /* EOVERFLOW */: + errmsg = "Value too large for defined data type"; + break; + case 133 /* EOWNERDEAD */: + errmsg = "Owner died"; + break; + case 134 /* EPROTO */: + errmsg = "Protocol error"; + break; + case 135 /* EPROTONOSUPPORT */: + errmsg = "Protocol not supported"; + break; + case 136 /* EPROTOTYPE */: + errmsg = "Protocol wrong type for socket"; + break; + case 138 /* ETIMEDOUT */: + errmsg = "Connection timed out"; + break; + case 140 /* EWOULDBLOCK */: + errmsg = "Operation would block"; + break; + default: + errmsg = NULL; + break; + } + if (errmsg != NULL) + ret = safe_copy (buf, buflen, errmsg); + } #endif if (ret == EINVAL && !*buf) - snprintf (buf, buflen, "Unknown error %d", errnum); + { +#if defined __HAIKU__ + /* For consistency with perror(). */ + snprintf (buf, buflen, "Unknown Application Error (%d)", errnum); +#else + snprintf (buf, buflen, "Unknown error %d", errnum); +#endif + } errno = saved_errno; return ret; diff --git a/lib/string.in.h b/lib/string.in.h index 9a6b311..29f4ba6 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2017 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -74,6 +74,23 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ +/* Clear a block of memory. The compiler will not delete a call to + this function, even if the block is dead after the call. */ +#if @GNULIB_EXPLICIT_BZERO@ +# if ! @HAVE_EXPLICIT_BZERO@ +_GL_FUNCDECL_SYS (explicit_bzero, void, + (void *__dest, size_t __n) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n)); +_GL_CXXALIASWARN (explicit_bzero); +#elif defined GNULIB_POSIXCHECK +# undef explicit_bzero +# if HAVE_RAW_DECL_EXPLICIT_BZERO +_GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is unportable - " + "use gnulib module explicit_bzero for portability"); +# endif +#endif + /* Find the index of the least-significant set bit. */ #if @GNULIB_FFSL@ # if !@HAVE_FFSL@ diff --git a/lib/strings.in.h b/lib/strings.in.h index 0374c94..b9d0a67 100644 --- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -1,6 +1,6 @@ /* A substitute . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_STRINGS_H diff --git a/lib/stripslash.c b/lib/stripslash.c index 2d9d166..60c6781 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,6 +1,6 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2017 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 2bb02d9..f750679 100644 --- a/lib/strncasecmp.c +++ b/lib/strncasecmp.c @@ -1,5 +1,5 @@ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/strndup.c b/lib/strndup.c index 546e58c..b5c18dd 100644 --- a/lib/strndup.c +++ b/lib/strndup.c @@ -1,6 +1,6 @@ /* A replacement function, for systems that lack strndup. - Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2017 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/strnlen.c b/lib/strnlen.c index 4cb1ca3..f0b1b8b 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/strnlen1.c b/lib/strnlen1.c index 63f78a6..4459f6b 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/strnlen1.h b/lib/strnlen1.h index 86cb177..896a180 100644 --- a/lib/strnlen1.h +++ b/lib/strnlen1.h @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _STRNLEN1_H #define _STRNLEN1_H diff --git a/lib/strpbrk.c b/lib/strpbrk.c index c0b7e12..cc3f0aa 100644 --- a/lib/strpbrk.c +++ b/lib/strpbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2017 Free Software +/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2018 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/strptime.c b/lib/strptime.c index c8e436e..6994ec4 100644 --- a/lib/strptime.c +++ b/lib/strptime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004-2005, 2007, 2009-2017 Free Software Foundation, +/* Copyright (C) 2002, 2004-2005, 2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _LIBC # include diff --git a/lib/strtok_r.c b/lib/strtok_r.c index bb59ae3..ef8e41d 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991, 1996-1999, 2001, 2004, 2007, 2009-2017 Free Software + Copyright (C) 1991, 1996-1999, 2001, 2004, 2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifdef HAVE_CONFIG_H # include diff --git a/lib/strtol.c b/lib/strtol.c index 751d1e0..55871b4 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2017 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifdef _LIBC # define USE_NUMBER_GROUPING diff --git a/lib/strtoll.c b/lib/strtoll.c index d770e81..8aa10f4 100644 --- a/lib/strtoll.c +++ b/lib/strtoll.c @@ -1,5 +1,5 @@ /* Function to parse a 'long long int' from text. - Copyright (C) 1995-1997, 1999, 2001, 2009-2017 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #define QUAD 1 diff --git a/lib/symlink.c b/lib/symlink.c index 60d4c14..c1c4b40 100644 --- a/lib/symlink.c +++ b/lib/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h index fc09209..efbf458 100644 --- a/lib/sys_file.in.h +++ b/lib/sys_file.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/file.h. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Richard W.M. Jones. */ diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index 7d410cd..42a5ca4 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_SYS_IOCTL_H @@ -31,6 +31,7 @@ /* AIX 5.1 and Solaris 10 declare ioctl() in and in , but not in . + Haiku declares ioctl() in , but not in . But avoid namespace pollution on glibc systems. */ #ifndef __GLIBC__ # include diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 616e77d..154e570 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ # if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index cf4f7bc..7a125e1 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -1,6 +1,6 @@ /* Provide a sys/socket header file for systems lacking it (read: MinGW) and for systems where it is incomplete. - Copyright (C) 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* This file is supposed to be used on platforms that lack , on platforms where cannot be included standalone, and on @@ -141,6 +141,15 @@ struct sockaddr_storage # define SHUT_RDWR 2 # endif +# ifdef __VMS /* OpenVMS */ +# ifndef CMSG_SPACE +# define CMSG_SPACE(length) _CMSG_SPACE(length) +# endif +# ifndef CMSG_LEN +# define CMSG_LEN(length) _CMSG_LEN(length) +# endif +# endif + #else # ifdef __CYGWIN__ @@ -160,7 +169,7 @@ struct sockaddr_storage code may not run on older Windows releases then. My Windows 2000 box was not able to run the code, for example. The situation is slightly confusing because - + suggests that getaddrinfo should be available on all Windows releases. */ @@ -662,7 +671,7 @@ _GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - " The flags are a bitmask, possibly including O_CLOEXEC (defined in ) and O_TEXT, O_BINARY (defined in "binary-io.h"). See also the Linux man page at - . */ + . */ # if @HAVE_ACCEPT4@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define accept4 rpl_accept4 diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index d5ca343..d96fde1 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ -/* Provide a more complete sys/stat header file. - Copyright (C) 2005-2017 Free Software Foundation, Inc. +/* Provide a more complete sys/stat.h header file. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ @@ -72,6 +72,75 @@ # define stat _stati64 #endif +/* Optionally, override 'struct stat' on native Windows. */ +#if @GNULIB_OVERRIDES_STRUCT_STAT@ + +# undef stat +# if @GNULIB_STAT@ +# define stat rpl_stat +# else + /* Provoke a clear link error if stat() is used as a function and + module 'stat' is not in use. */ +# define stat stat_used_without_requesting_gnulib_module_stat +# endif + +# if !GNULIB_defined_struct_stat +struct stat +{ + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; +# if 0 + uid_t st_uid; +# else /* uid_t is not defined by default on native Windows. */ + short st_uid; +# endif +# if 0 + gid_t st_gid; +# else /* gid_t is not defined by default on native Windows. */ + short st_gid; +# endif + dev_t st_rdev; + off_t st_size; +# if 0 + blksize_t st_blksize; + blkcnt_t st_blocks; +# endif + +# if @WINDOWS_STAT_TIMESPEC@ + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; +# else + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +# endif +}; +# if @WINDOWS_STAT_TIMESPEC@ +# define st_atime st_atim.tv_sec +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec + /* Indicator, for gnulib internal purposes. */ +# define _GL_WINDOWS_STAT_TIMESPEC 1 +# endif +# define GNULIB_defined_struct_stat 1 +# endif + +/* Other possible values of st_mode. */ +# if 0 +# define _S_IFBLK 0x6000 +# endif +# if 0 +# define _S_IFLNK 0xA000 +# endif +# if 0 +# define _S_IFSOCK 0xC000 +# endif + +#endif + #ifndef S_IFIFO # ifdef _S_IFIFO # define S_IFIFO _S_IFIFO @@ -345,6 +414,9 @@ _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); # endif _GL_CXXALIASWARN (fstat); +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef fstat +# define fstat fstat_used_without_requesting_gnulib_module_fstat #elif @WINDOWS_64_BIT_ST_SIZE@ /* Above, we define stat to _stati64. */ # define fstat _fstati64 @@ -378,6 +450,9 @@ _GL_CXXALIAS_SYS (fstatat, int, (int fd, char const *name, struct stat *st, int flags)); # endif _GL_CXXALIASWARN (fstatat); +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef fstatat +# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat #elif defined GNULIB_POSIXCHECK # undef fstatat # if HAVE_RAW_DECL_FSTATAT @@ -476,6 +551,9 @@ _GL_CXXALIAS_SYS (lstat, int, (const char *name, struct stat *buf)); # if @HAVE_LSTAT@ _GL_CXXALIASWARN (lstat); # endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef lstat +# define lstat lstat_used_without_requesting_gnulib_module_lstat #elif defined GNULIB_POSIXCHECK # undef lstat # if HAVE_RAW_DECL_LSTAT @@ -625,63 +703,69 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - " #if @GNULIB_STAT@ # if @REPLACE_STAT@ -/* We can't use the object-like #define stat rpl_stat, because of - struct stat. This means that rpl_stat will not be used if the user - does (stat)(a,b). Oh well. */ -# if defined _AIX && defined stat && defined _LARGE_FILES - /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, - so we have to replace stat64() instead of stat(). */ -# undef stat64 -# define stat64(name, st) rpl_stat (name, st) -# elif @WINDOWS_64_BIT_ST_SIZE@ - /* Above, we define stat to _stati64. */ -# if defined __MINGW32__ && defined _stati64 -# ifndef _USE_32BIT_TIME_T - /* The system headers define _stati64 to _stat64. */ -# undef _stat64 -# define _stat64(name, st) rpl_stat (name, st) +# if !@GNULIB_OVERRIDES_STRUCT_STAT@ + /* We can't use the object-like #define stat rpl_stat, because of + struct stat. This means that rpl_stat will not be used if the user + does (stat)(a,b). Oh well. */ +# if defined _AIX && defined stat && defined _LARGE_FILES + /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, + so we have to replace stat64() instead of stat(). */ +# undef stat64 +# define stat64(name, st) rpl_stat (name, st) +# elif @WINDOWS_64_BIT_ST_SIZE@ + /* Above, we define stat to _stati64. */ +# if defined __MINGW32__ && defined _stati64 +# ifndef _USE_32BIT_TIME_T + /* The system headers define _stati64 to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# elif defined _MSC_VER && defined _stati64 +# ifdef _USE_32BIT_TIME_T + /* The system headers define _stati64 to _stat32i64. */ +# undef _stat32i64 +# define _stat32i64(name, st) rpl_stat (name, st) +# else + /* The system headers define _stati64 to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# else +# undef _stati64 +# define _stati64(name, st) rpl_stat (name, st) # endif -# elif defined _MSC_VER && defined _stati64 +# elif defined __MINGW32__ && defined stat # ifdef _USE_32BIT_TIME_T - /* The system headers define _stati64 to _stat32i64. */ + /* The system headers define stat to _stat32i64. */ # undef _stat32i64 # define _stat32i64(name, st) rpl_stat (name, st) # else - /* The system headers define _stati64 to _stat64. */ + /* The system headers define stat to _stat64. */ # undef _stat64 # define _stat64(name, st) rpl_stat (name, st) # endif -# else -# undef _stati64 -# define _stati64(name, st) rpl_stat (name, st) -# endif -# elif defined __MINGW32__ && defined stat -# ifdef _USE_32BIT_TIME_T - /* The system headers define stat to _stat32i64. */ -# undef _stat32i64 -# define _stat32i64(name, st) rpl_stat (name, st) -# else - /* The system headers define stat to _stat64. */ -# undef _stat64 -# define _stat64(name, st) rpl_stat (name, st) -# endif -# elif defined _MSC_VER && defined stat -# ifdef _USE_32BIT_TIME_T - /* The system headers define stat to _stat32. */ -# undef _stat32 -# define _stat32(name, st) rpl_stat (name, st) -# else - /* The system headers define stat to _stat64i32. */ -# undef _stat64i32 -# define _stat64i32(name, st) rpl_stat (name, st) -# endif -# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ -# undef stat -# define stat(name, st) rpl_stat (name, st) -# endif /* !_LARGE_FILES */ +# elif defined _MSC_VER && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32. */ +# undef _stat32 +# define _stat32(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64i32. */ +# undef _stat64i32 +# define _stat64i32(name, st) rpl_stat (name, st) +# endif +# else /* !(_AIX || __MINGW32__ || _MSC_VER) */ +# undef stat +# define stat(name, st) rpl_stat (name, st) +# endif /* !_LARGE_FILES */ +# endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */ _GL_EXTERN_C int stat (const char *name, struct stat *buf) _GL_ARG_NONNULL ((1, 2)); # endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +/* see above: + #define stat stat_used_without_requesting_gnulib_module_stat + */ #elif defined GNULIB_POSIXCHECK # undef stat # if HAVE_RAW_DECL_STAT diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 57739bc..b4a0e49 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 30ebfbd..7473716 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -42,6 +42,48 @@ # define _GL_WINDOWS_64_BIT_OFF_T 1 #endif +/* Override dev_t and ino_t if distinguishable inodes support is requested + on native Windows. */ +#if @WINDOWS_STAT_INODES@ + +# if @WINDOWS_STAT_INODES@ == 2 +/* Experimental, not useful in Windows 10. */ + +/* Define dev_t to a 64-bit type. */ +# if !defined GNULIB_defined_dev_t +typedef unsigned long long int rpl_dev_t; +# undef dev_t +# define dev_t rpl_dev_t +# define GNULIB_defined_dev_t 1 +# endif + +/* Define ino_t to a 128-bit type. */ +# if !defined GNULIB_defined_ino_t +/* MSVC does not have a 128-bit integer type. + GCC has a 128-bit integer type __int128, but only on 64-bit targets. */ +typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t; +# undef ino_t +# define ino_t rpl_ino_t +# define GNULIB_defined_ino_t 1 +# endif + +# else /* @WINDOWS_STAT_INODES@ == 1 */ + +/* Define ino_t to a 64-bit type. */ +# if !defined GNULIB_defined_ino_t +typedef unsigned long long int rpl_ino_t; +# undef ino_t +# define ino_t rpl_ino_t +# define GNULIB_defined_ino_t 1 +# endif + +# endif + +/* Indicator, for gnulib internal purposes. */ +# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@ + +#endif + /* MSVC 9 defines size_t in , not in . */ /* But avoid namespace pollution on glibc systems. */ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h index d45d846..0b5790b 100644 --- a/lib/sys_uio.in.h +++ b/lib/sys_uio.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2011-2017 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ # if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h index 1458d26..15a80dd 100644 --- a/lib/sys_wait.in.h +++ b/lib/sys_wait.in.h @@ -1,5 +1,5 @@ /* A POSIX-like . - Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_SYS_WAIT_H diff --git a/lib/tempname.c b/lib/tempname.c index 2cd9032..da81263 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,6 +1,6 @@ /* tempname.c - generate the name of a temporary file. - Copyright (C) 1991-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Extracted from glibc sysdeps/posix/tempname.c. See also tmpdir.c. */ @@ -69,7 +69,6 @@ # define __mkdir mkdir # define __open open # define __lxstat64(version, file, buf) lstat (file, buf) -# define __secure_getenv secure_getenv #endif #ifdef _LIBC @@ -279,7 +278,7 @@ try_nocreate (char *tmpl, void *flags _GL_UNUSED) { struct_stat64 st; - if (__lxstat64 (_STAT_VER, tmpl, &st) == 0) + if (__lxstat64 (_STAT_VER, tmpl, &st) == 0 || errno == EOVERFLOW) __set_errno (EEXIST); return errno == ENOENT ? 0 : -1; } diff --git a/lib/tempname.h b/lib/tempname.h index 1ca9748..4020c73 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* header written by Eric Blake */ diff --git a/lib/time.in.h b/lib/time.in.h index fef8980..a2dca89 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard . - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -120,6 +120,24 @@ _GL_CXXALIAS_SYS (nanosleep, int, _GL_CXXALIASWARN (nanosleep); # endif +/* Initialize time conversion information. */ +# if @GNULIB_TZSET@ +# if @REPLACE_TZSET@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tzset +# define tzset rpl_tzset +# endif +_GL_FUNCDECL_RPL (tzset, void, (void)); +_GL_CXXALIAS_RPL (tzset, void, (void)); +# else +# if ! @HAVE_TZSET@ +_GL_FUNCDECL_SYS (tzset, void, (void)); +# endif +_GL_CXXALIAS_SYS (tzset, void, (void)); +# endif +_GL_CXXALIASWARN (tzset); +# endif + /* Return the 'time_t' representation of TP and normalize TP. */ # if @GNULIB_MKTIME@ # if @REPLACE_MKTIME@ @@ -187,7 +205,7 @@ _GL_CXXALIASWARN (gmtime_r); /* Convert TIMER to RESULT, assuming local time and UTC respectively. See and . */ -# if @GNULIB_GETTIMEOFDAY@ +# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@ # if @REPLACE_LOCALTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef localtime @@ -202,7 +220,7 @@ _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); _GL_CXXALIASWARN (localtime); # endif -# if @GNULIB_GETTIMEOFDAY@ +# if 0 || @REPLACE_GMTIME@ # if @REPLACE_GMTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef gmtime @@ -233,6 +251,41 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf, _GL_CXXALIASWARN (strptime); # endif +/* Convert *TP to a date and time string. See + . */ +# if @GNULIB_CTIME@ +# if @REPLACE_CTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define ctime rpl_ctime +# endif +_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); +# else +_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); +# endif +_GL_CXXALIASWARN (ctime); +# endif + +/* Convert *TP to a date and time string. See + . */ +# if @GNULIB_STRFTIME@ +# if @REPLACE_STRFTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strftime rpl_strftime +# endif +_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize, + const char *__fmt, const struct tm *__tp) + _GL_ARG_NONNULL ((1, 3, 4))); +_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize, + const char *__fmt, const struct tm *__tp)); +# else +_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, + const char *__fmt, const struct tm *__tp)); +# endif +_GL_CXXALIASWARN (strftime); +# endif + # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ typedef struct tm_zone *timezone_t; _GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); diff --git a/lib/time_r.c b/lib/time_r.c index 708a98b..3029780 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/timegm.c b/lib/timegm.c index 957a3b8..7eb5ecb 100644 --- a/lib/timegm.c +++ b/lib/timegm.c @@ -1,6 +1,6 @@ /* Convert UTC calendar time to simple time. Like mktime but assumes UTC. - Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2017 Free Software + Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _LIBC # include diff --git a/lib/timespec.h b/lib/timespec.h index a5eca79..eef3030 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -1,6 +1,6 @@ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2017 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #if ! defined TIMESPEC_H # define TIMESPEC_H @@ -29,6 +29,12 @@ _GL_INLINE_HEADER_BEGIN # define _GL_TIMESPEC_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + +#include "verify.h" + /* Resolution of timespec timestamps (in units per second), and log base 10 of the resolution. */ @@ -63,23 +69,29 @@ make_timespec (time_t s, long int ns) any platform of interest to the GNU project, since all such platforms have 32-bit int or wider. - Replacing "(int) (a.tv_nsec - b.tv_nsec)" with something like + Replacing "a.tv_nsec - b.tv_nsec" with something like "a.tv_nsec < b.tv_nsec ? -1 : a.tv_nsec > b.tv_nsec" would cause this function to work in some cases where the above assumption is violated, but not in all cases (e.g., a.tv_sec==1, a.tv_nsec==-2, b.tv_sec==0, b.tv_nsec==999999999) and is arguably not worth the extra instructions. Using a subtraction has the advantage of detecting some invalid cases on platforms that detect integer - overflow. - - The (int) cast avoids a gcc -Wconversion warning. */ + overflow. */ _GL_TIMESPEC_INLINE int _GL_ATTRIBUTE_PURE timespec_cmp (struct timespec a, struct timespec b) { - return (a.tv_sec < b.tv_sec ? -1 - : a.tv_sec > b.tv_sec ? 1 - : (int) (a.tv_nsec - b.tv_nsec)); + if (a.tv_sec < b.tv_sec) + return -1; + if (a.tv_sec > b.tv_sec) + return 1; + + /* Pacify gcc -Wstrict-overflow (bleeding-edge circa 2017-10-02). See: + http://lists.gnu.org/r/bug-gnulib/2017-10/msg00006.html */ + assume (-1 <= a.tv_nsec && a.tv_nsec <= 2 * TIMESPEC_RESOLUTION); + assume (-1 <= b.tv_nsec && b.tv_nsec <= 2 * TIMESPEC_RESOLUTION); + + return a.tv_nsec - b.tv_nsec; } /* Return -1, 0, 1, depending on the sign of A. A.tv_nsec must be @@ -107,6 +119,10 @@ timespectod (struct timespec a) void gettime (struct timespec *); int settime (struct timespec const *); +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif diff --git a/lib/tmpdir.c b/lib/tmpdir.c index 2116dff..d7ee70e 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2001-2002, 2006, 2009-2017 Free Software Foundation, +/* Copyright (C) 1999, 2001-2002, 2006, 2009-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Extracted from sysdeps/posix/tempname.c. */ diff --git a/lib/tmpdir.h b/lib/tmpdir.h index b0c3de7..53d3c0f 100644 --- a/lib/tmpdir.h +++ b/lib/tmpdir.h @@ -1,5 +1,5 @@ /* Determine a temporary directory. - Copyright (C) 2001-2002, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include #include diff --git a/lib/u64.h b/lib/u64.h index a860193..498b7f9 100644 --- a/lib/u64.h +++ b/lib/u64.h @@ -1,6 +1,6 @@ /* uint64_t-like operations that work even on hosts lacking uint64_t - Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/unicase.in.h b/lib/unicase.in.h index e50e5fc..f97b68c 100644 --- a/lib/unicase.in.h +++ b/lib/unicase.in.h @@ -1,5 +1,5 @@ /* Unicode character case mappings. - Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNICASE_H #define _UNICASE_H diff --git a/lib/unicase/cased.c b/lib/unicase/cased.c index b2d0e1a..d5f7c53 100644 --- a/lib/unicase/cased.c +++ b/lib/unicase/cased.c @@ -1,5 +1,5 @@ /* Test whether a Unicode character is cased. - Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unicase/cased.h b/lib/unicase/cased.h index 156c1ee..7b1e5b1 100644 --- a/lib/unicase/cased.h +++ b/lib/unicase/cased.h @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Casing Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ #define header_0 16 #define header_2 9 #define header_3 127 @@ -11,7 +11,7 @@ struct int header[1]; int level1[2]; short level2[2 << 7]; - /*unsigned*/ int level3[20 << 4]; + /*unsigned*/ int level3[21 << 4]; } u_casing_property_cased = { @@ -265,11 +265,11 @@ u_casing_property_cased = -1, -1, -1, + 3 + 256 * sizeof (short) / sizeof (int) + 304, -1, -1, -1, - -1, - 3 + 256 * sizeof (short) / sizeof (int) + 304, + 3 + 256 * sizeof (short) / sizeof (int) + 320, -1, -1, -1, @@ -300,7 +300,7 @@ u_casing_property_cased = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x3F3FFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x000001FF, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -322,7 +322,7 @@ u_casing_property_cased = 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00003FFF, 0x3FFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFF78FF, 0x00FF3FFF, 0x00000000, 0x07000000, + 0xFFFF78FF, 0x00FF7FFF, 0x00000000, 0x07000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0xF7FFFFFF, 0xFFFF003F, @@ -336,7 +336,7 @@ u_casing_property_cased = 0x00000000, 0x07FFFFFE, 0x07FFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000FFFF, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0xFFFF0000, 0xFF0FFFFF, 0x0FFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -357,6 +357,10 @@ u_casing_property_cased = 0xFFFFFDFF, 0xFFFFFDFF, 0x00000FF7, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0xFFFFFFFF, 0xFFFFFFFF, 0x0000000F, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0xFFFF03FF, 0xFFFF03FF, 0x000003FF, 0x00000000, 0x00000000, 0x00000000 } diff --git a/lib/unicase/caseprop.h b/lib/unicase/caseprop.h index ea06a91..f1e47b3 100644 --- a/lib/unicase/caseprop.h +++ b/lib/unicase/caseprop.h @@ -1,5 +1,5 @@ /* Case related properties of Unicode characters. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include #include "unitypes.h" diff --git a/lib/unicase/context.h b/lib/unicase/context.h index 58abc80..64d331e 100644 --- a/lib/unicase/context.h +++ b/lib/unicase/context.h @@ -1,5 +1,5 @@ /* Case-mapping contexts of UTF-8/UTF-16/UTF-32 substring. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* The context of a prefix string combines the information of the "Before C" diff --git a/lib/unicase/empty-prefix-context.c b/lib/unicase/empty-prefix-context.c index 7cefbe9..01a362b 100644 --- a/lib/unicase/empty-prefix-context.c +++ b/lib/unicase/empty-prefix-context.c @@ -1,5 +1,5 @@ /* Case-mapping context of empty prefix string. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unicase/empty-suffix-context.c b/lib/unicase/empty-suffix-context.c index 909e412..16be069 100644 --- a/lib/unicase/empty-suffix-context.c +++ b/lib/unicase/empty-suffix-context.c @@ -1,5 +1,5 @@ /* Case-mapping context of empty suffix string. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unicase/ignorable.c b/lib/unicase/ignorable.c index 99e5b88..85ba619 100644 --- a/lib/unicase/ignorable.c +++ b/lib/unicase/ignorable.c @@ -1,5 +1,5 @@ /* Test whether a Unicode character is case-ignorable. - Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unicase/ignorable.h b/lib/unicase/ignorable.h index 3b7f1ff..a80b60d 100644 --- a/lib/unicase/ignorable.h +++ b/lib/unicase/ignorable.h @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Casing Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ #define header_0 16 #define header_2 9 #define header_3 127 @@ -11,7 +11,7 @@ struct int header[1]; int level1[15]; short level2[3 << 7]; - /*unsigned*/ int level3[42 << 4]; + /*unsigned*/ int level3[44 << 4]; } u_casing_property_case_ignorable = { @@ -176,6 +176,7 @@ u_casing_property_case_ignorable = 16 + 384 * sizeof (short) / sizeof (int) + 512, -1, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 528, -1, -1, -1, @@ -214,11 +215,9 @@ u_casing_property_case_ignorable = -1, -1, -1, - -1, - 16 + 384 * sizeof (short) / sizeof (int) + 528, - -1, 16 + 384 * sizeof (short) / sizeof (int) + 544, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 560, -1, -1, -1, @@ -256,8 +255,8 @@ u_casing_property_case_ignorable = -1, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 560, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 576, -1, -1, -1, @@ -266,31 +265,32 @@ u_casing_property_case_ignorable = -1, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 576, - 16 + 384 * sizeof (short) / sizeof (int) + 592, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 592, + 16 + 384 * sizeof (short) / sizeof (int) + 608, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 608, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 624, -1, -1, + 16 + 384 * sizeof (short) / sizeof (int) + 640, -1, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 624, + 16 + 384 * sizeof (short) / sizeof (int) + 656, -1, -1, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 640, + 16 + 384 * sizeof (short) / sizeof (int) + 672, -1, -1, -1, -1, -1, -1, - 16 + 384 * sizeof (short) / sizeof (int) + 656, + 16 + 384 * sizeof (short) / sizeof (int) + 688, -1, -1, -1, @@ -437,7 +437,7 @@ u_casing_property_case_ignorable = 0x00028000, 0xFFFF0000, 0x000007FF, 0x00000000, 0x00000000, 0x0001FFC0, 0x00000000, 0x043FF800, 0xFFC00000, 0x00003FFF, 0x0E000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFF8, + 0x00000000, 0x00000000, 0xFFF00000, 0xFFFFFFFF, 0x00000007, 0x14000000, 0x00FE21FE, 0x0002000C, 0x00000002, 0x10000000, 0x0000201E, 0x0000000C, 0x00000006, 0x10000000, 0x00023986, 0x00230000, @@ -465,7 +465,7 @@ u_casing_property_case_ignorable = 0x001C0000, 0x001C0000, 0x000C0000, 0x000C0000, 0x00000000, 0x3FB00000, 0x208FFE40, 0x00000000, 0x00007800, 0x00000000, 0x00000008, 0x00000000, - 0x00000000, 0x00000200, 0x00000000, 0x00000000, + 0x00000060, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x0E040187, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x09800000, 0x00000000, 0x7F400000, 0x9FF81FE5, @@ -475,7 +475,7 @@ u_casing_property_case_ignorable = 0x00000000, 0x00CFF000, 0x00000000, 0x3F000000, 0x00000000, 0x00000000, 0xFFF70000, 0x031021FD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0xFFFFFFFF, 0xF03FFFFF, + 0x00000000, 0x00000000, 0xFFFFFFFF, 0xF83FFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -509,7 +509,7 @@ u_casing_property_case_ignorable = 0xFFFFFFFF, 0x00000003, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x00000000, 0x00000000, 0x00000844, 0x00000060, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000010, 0x0003FFFF, + 0x00000000, 0x00000000, 0x00000030, 0x0003FFFF, 0x00000000, 0x00003FC0, 0x0003FF80, 0x00000000, 0x00000007, 0x13C80000, 0x00008000, 0x00000060, 0x00000000, 0x00667E00, 0x00001008, 0x10010000, @@ -540,11 +540,11 @@ u_casing_property_case_ignorable = 0x00000003, 0x26780000, 0x00000000, 0x00000000, 0x00000007, 0x001FEF80, 0x00000000, 0x00080000, 0x00000003, 0x7FC00000, 0x00001C00, 0x00000000, - 0x00000000, 0x00D38000, 0x00000000, 0x00000000, + 0x00000000, 0x40D38000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x000007F8, 0x00000003, 0x10000000, 0x00000001, 0x001F1FC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0xFF000000, 0x0000005C, 0x00000000, 0x00000000, 0x85F80000, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xB03C0000, 0x30000001, 0x00000000, @@ -552,6 +552,10 @@ u_casing_property_case_ignorable = 0x00000000, 0x00BF2800, 0x00000000, 0x00000000, 0xE0000000, 0x00000FBC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0xBF7F0000, 0x00000000, 0x00000000, + 0xFFFC0000, 0x006DFCFF, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001F0000, 0x00000000, 0x007F0000, 0x0000000F, 0x00000000, @@ -559,7 +563,7 @@ u_casing_property_case_ignorable = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0xFFFF8000, 0x00000000, 0x00000000, 0x00000000, + 0xFFFF8000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x60000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -576,11 +580,15 @@ u_casing_property_case_ignorable = 0xF8000010, 0x0000FFFE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0xF9FFFF7F, 0x000007DB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x007F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x007F0000, 0x00000000, + 0x00000000, 0x00000000, 0x000007F0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xF8000000, diff --git a/lib/unicase/simple-mapping.h b/lib/unicase/simple-mapping.h index b1de152..628b08e 100644 --- a/lib/unicase/simple-mapping.h +++ b/lib/unicase/simple-mapping.h @@ -1,5 +1,5 @@ /* Simple case mapping for Unicode characters. - Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ ucs4_t FUNC (ucs4_t uc) diff --git a/lib/unicase/special-casing-table.gperf b/lib/unicase/special-casing-table.gperf index 8d8d14f..287f49a 100644 --- a/lib/unicase/special-casing-table.gperf +++ b/lib/unicase/special-casing-table.gperf @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Special casing rules of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ struct special_casing_rule { char code[3]; }; %struct-type %language=ANSI-C diff --git a/lib/unicase/special-casing-table.h b/lib/unicase/special-casing-table.h index 45dc431..4943541 100644 --- a/lib/unicase/special-casing-table.h +++ b/lib/unicase/special-casing-table.h @@ -1,5 +1,5 @@ -/* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 10 lib/unicase/special-casing-table.gperf */ +/* ANSI-C code produced by gperf version 3.1 */ +/* Command-line: gperf -m 10 ./unicase/special-casing-table.gperf */ /* Computed positions: -k'1-3' */ @@ -19,7 +19,7 @@ inline #endif /*ARGSUSED*/ static unsigned int -gl_unicase_special_hash (register const char *str, register unsigned int len) +gl_unicase_special_hash (register const char *str, register size_t len) { static const unsigned char asso_values[] = { @@ -53,14 +53,8 @@ gl_unicase_special_hash (register const char *str, register unsigned int len) return asso_values[(unsigned char)str[2]+1] + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]]; } -#ifdef __GNUC__ -__inline -#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif -#endif const struct special_casing_rule * -gl_unicase_special_lookup (const char *str, size_t len) +gl_unicase_special_lookup (register const char *str, register size_t len) { static const unsigned char lengthtable[] = { @@ -76,257 +70,257 @@ gl_unicase_special_lookup (const char *str, size_t len) }; static const struct special_casing_rule wordlist[] = { -#line 126 "lib/unicase/special-casing-table.gperf" +#line 126 "./unicase/special-casing-table.gperf" {"\373\001\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0046, 0x0049, 0 }, { 0xFB01, 0, 0 }, { 0x0046, 0x0069, 0 }, { 0x0066, 0x0069, 0 }}, -#line 31 "lib/unicase/special-casing-table.gperf" +#line 31 "./unicase/special-casing-table.gperf" {"\001I\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x02BC, 0x004E, 0 }, { 0x0149, 0, 0 }, { 0x02BC, 0x004E, 0 }, { 0x02BC, 0x006E, 0 }}, -#line 125 "lib/unicase/special-casing-table.gperf" +#line 125 "./unicase/special-casing-table.gperf" {"\373\000\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0046, 0x0046, 0 }, { 0xFB00, 0, 0 }, { 0x0046, 0x0066, 0 }, { 0x0066, 0x0066, 0 }}, -#line 15 "lib/unicase/special-casing-table.gperf" +#line 15 "./unicase/special-casing-table.gperf" {"\000I\000", 1, SCC_MORE_ABOVE , { 'l', 't' }, { 0x0049, 0, 0 }, { 0x0069, 0x0307, 0 }, { 0x0049, 0, 0 }, { 0x0069, 0, 0 }}, -#line 127 "lib/unicase/special-casing-table.gperf" +#line 127 "./unicase/special-casing-table.gperf" {"\373\002\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0046, 0x004C, 0 }, { 0xFB02, 0, 0 }, { 0x0046, 0x006C, 0 }, { 0x0066, 0x006C, 0 }}, -#line 128 "lib/unicase/special-casing-table.gperf" +#line 128 "./unicase/special-casing-table.gperf" {"\373\003\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0046, 0x0046, 0x0049 }, { 0xFB03, 0, 0 }, { 0x0046, 0x0066, 0x0069 }, { 0x0066, 0x0066, 0x0069 }}, -#line 28 "lib/unicase/special-casing-table.gperf" +#line 28 "./unicase/special-casing-table.gperf" {"\0010\000", 1, SCC_ALWAYS , { 't', 'r' }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }}, -#line 16 "lib/unicase/special-casing-table.gperf" +#line 16 "./unicase/special-casing-table.gperf" {"\000I\001", 1, -SCC_BEFORE_DOT , { 't', 'r' }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }}, -#line 17 "lib/unicase/special-casing-table.gperf" +#line 17 "./unicase/special-casing-table.gperf" {"\000I\002", 1, -SCC_BEFORE_DOT , { 'a', 'z' }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }}, -#line 33 "lib/unicase/special-casing-table.gperf" +#line 33 "./unicase/special-casing-table.gperf" {"\003\007\000", 1, SCC_AFTER_SOFT_DOTTED, { 'l', 't' }, { 0, 0, 0 }, { 0x0307, 0, 0 }, { 0, 0, 0 }, { 0x0307, 0, 0 }}, -#line 29 "lib/unicase/special-casing-table.gperf" +#line 29 "./unicase/special-casing-table.gperf" {"\0010\001", 1, SCC_ALWAYS , { 'a', 'z' }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }}, -#line 30 "lib/unicase/special-casing-table.gperf" +#line 30 "./unicase/special-casing-table.gperf" {"\0010\002", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0130, 0, 0 }, { 0x0069, 0x0307, 0 }, { 0x0130, 0, 0 }, { 0x0069, 0x0307, 0 }}, -#line 130 "lib/unicase/special-casing-table.gperf" +#line 130 "./unicase/special-casing-table.gperf" {"\373\005\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0053, 0x0054, 0 }, { 0xFB05, 0, 0 }, { 0x0053, 0x0074, 0 }, { 0x0073, 0x0074, 0 }}, -#line 34 "lib/unicase/special-casing-table.gperf" +#line 34 "./unicase/special-casing-table.gperf" {"\003\007\001", 1, SCC_AFTER_I , { 't', 'r' }, { 0x0307, 0, 0 }, { 0, 0, 0 }, { 0x0307, 0, 0 }, { 0x0307, 0, 0 }}, -#line 35 "lib/unicase/special-casing-table.gperf" +#line 35 "./unicase/special-casing-table.gperf" {"\003\007\002", 0, SCC_AFTER_I , { 'a', 'z' }, { 0x0307, 0, 0 }, { 0, 0, 0 }, { 0x0307, 0, 0 }, { 0x0307, 0, 0 }}, -#line 19 "lib/unicase/special-casing-table.gperf" +#line 19 "./unicase/special-casing-table.gperf" {"\000I\004", 0, SCC_ALWAYS , { 'a', 'z' }, { 0x0049, 0, 0 }, { 0x0069, 0, 0 }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }}, -#line 23 "lib/unicase/special-casing-table.gperf" +#line 23 "./unicase/special-casing-table.gperf" {"\000\314\000", 0, SCC_ALWAYS , { 'l', 't' }, { 0x00CC, 0, 0 }, { 0x0069, 0x0307, 0x0300 }, { 0x00CC, 0, 0 }, { 0x00EC, 0, 0 }}, -#line 109 "lib/unicase/special-casing-table.gperf" +#line 109 "./unicase/special-casing-table.gperf" {"\037\314\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0397, 0x0399, 0 }, { 0x1FC3, 0, 0 }, { 0x1FCC, 0, 0 }, { 0x03B7, 0x03B9, 0 }}, -#line 85 "lib/unicase/special-casing-table.gperf" +#line 85 "./unicase/special-casing-table.gperf" {"\037\243\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6B, 0x0399, 0 }, { 0x1FA3, 0, 0 }, { 0x1FAB, 0, 0 }, { 0x1F63, 0x03B9, 0 }}, -#line 80 "lib/unicase/special-casing-table.gperf" +#line 80 "./unicase/special-casing-table.gperf" {"\037\236\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2E, 0x0399, 0 }, { 0x1F96, 0, 0 }, { 0x1F9E, 0, 0 }, { 0x1F26, 0x03B9, 0 }}, -#line 37 "lib/unicase/special-casing-table.gperf" +#line 37 "./unicase/special-casing-table.gperf" {"\003\243\000", 0, SCC_FINAL_SIGMA , { '\0', '\0' }, { 0x03A3, 0, 0 }, { 0x03C2, 0, 0 }, { 0x03A3, 0, 0 }, { 0x03C3, 0, 0 }}, -#line 45 "lib/unicase/special-casing-table.gperf" +#line 45 "./unicase/special-casing-table.gperf" {"\036\236\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1E9E, 0, 0 }, { 0x00DF, 0, 0 }, { 0x1E9E, 0, 0 }, { 0x0073, 0x0073, 0 }}, -#line 76 "lib/unicase/special-casing-table.gperf" +#line 76 "./unicase/special-casing-table.gperf" {"\037\232\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2A, 0x0399, 0 }, { 0x1F92, 0, 0 }, { 0x1F9A, 0, 0 }, { 0x1F22, 0x03B9, 0 }}, -#line 75 "lib/unicase/special-casing-table.gperf" +#line 75 "./unicase/special-casing-table.gperf" {"\037\231\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F29, 0x0399, 0 }, { 0x1F91, 0, 0 }, { 0x1F99, 0, 0 }, { 0x1F21, 0x03B9, 0 }}, -#line 44 "lib/unicase/special-casing-table.gperf" +#line 44 "./unicase/special-casing-table.gperf" {"\036\232\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0041, 0x02BE, 0 }, { 0x1E9A, 0, 0 }, { 0x0041, 0x02BE, 0 }, { 0x0061, 0x02BE, 0 }}, -#line 43 "lib/unicase/special-casing-table.gperf" +#line 43 "./unicase/special-casing-table.gperf" {"\036\231\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0059, 0x030A, 0 }, { 0x1E99, 0, 0 }, { 0x0059, 0x030A, 0 }, { 0x0079, 0x030A, 0 }}, -#line 74 "lib/unicase/special-casing-table.gperf" +#line 74 "./unicase/special-casing-table.gperf" {"\037\230\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F28, 0x0399, 0 }, { 0x1F90, 0, 0 }, { 0x1F98, 0, 0 }, { 0x1F20, 0x03B9, 0 }}, -#line 73 "lib/unicase/special-casing-table.gperf" +#line 73 "./unicase/special-casing-table.gperf" {"\037\227\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2F, 0x0399, 0 }, { 0x1F97, 0, 0 }, { 0x1F9F, 0, 0 }, { 0x1F27, 0x03B9, 0 }}, -#line 42 "lib/unicase/special-casing-table.gperf" +#line 42 "./unicase/special-casing-table.gperf" {"\036\230\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0057, 0x030A, 0 }, { 0x1E98, 0, 0 }, { 0x0057, 0x030A, 0 }, { 0x0077, 0x030A, 0 }}, -#line 41 "lib/unicase/special-casing-table.gperf" +#line 41 "./unicase/special-casing-table.gperf" {"\036\227\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0054, 0x0308, 0 }, { 0x1E97, 0, 0 }, { 0x0054, 0x0308, 0 }, { 0x0074, 0x0308, 0 }}, -#line 72 "lib/unicase/special-casing-table.gperf" +#line 72 "./unicase/special-casing-table.gperf" {"\037\226\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2E, 0x0399, 0 }, { 0x1F96, 0, 0 }, { 0x1F9E, 0, 0 }, { 0x1F26, 0x03B9, 0 }}, -#line 66 "lib/unicase/special-casing-table.gperf" +#line 66 "./unicase/special-casing-table.gperf" {"\037\220\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F28, 0x0399, 0 }, { 0x1F90, 0, 0 }, { 0x1F98, 0, 0 }, { 0x1F20, 0x03B9, 0 }}, -#line 40 "lib/unicase/special-casing-table.gperf" +#line 40 "./unicase/special-casing-table.gperf" {"\036\226\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0048, 0x0331, 0 }, { 0x1E96, 0, 0 }, { 0x0048, 0x0331, 0 }, { 0x0068, 0x0331, 0 }}, -#line 36 "lib/unicase/special-casing-table.gperf" +#line 36 "./unicase/special-casing-table.gperf" {"\003\220\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0399, 0x0308, 0x0301 }, { 0x0390, 0, 0 }, { 0x0399, 0x0308, 0x0301 }, { 0x03B9, 0x0308, 0x0301 }}, -#line 57 "lib/unicase/special-casing-table.gperf" +#line 57 "./unicase/special-casing-table.gperf" {"\037\207\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0F, 0x0399, 0 }, { 0x1F87, 0, 0 }, { 0x1F8F, 0, 0 }, { 0x1F07, 0x03B9, 0 }}, -#line 21 "lib/unicase/special-casing-table.gperf" +#line 21 "./unicase/special-casing-table.gperf" {"\000i\000", 1, SCC_ALWAYS , { 't', 'r' }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }}, -#line 124 "lib/unicase/special-casing-table.gperf" +#line 124 "./unicase/special-casing-table.gperf" {"\037\374\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A9, 0x0399, 0 }, { 0x1FF3, 0, 0 }, { 0x1FFC, 0, 0 }, { 0x03C9, 0x03B9, 0 }}, -#line 129 "lib/unicase/special-casing-table.gperf" +#line 129 "./unicase/special-casing-table.gperf" {"\373\004\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0046, 0x0046, 0x004C }, { 0xFB04, 0, 0 }, { 0x0046, 0x0066, 0x006C }, { 0x0066, 0x0066, 0x006C }}, -#line 123 "lib/unicase/special-casing-table.gperf" +#line 123 "./unicase/special-casing-table.gperf" {"\037\367\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A9, 0x0342, 0x0399 }, { 0x1FF7, 0, 0 }, { 0x03A9, 0x0342, 0x0345 }, { 0x03C9, 0x0342, 0x03B9 }}, -#line 22 "lib/unicase/special-casing-table.gperf" +#line 22 "./unicase/special-casing-table.gperf" {"\000i\001", 0, SCC_ALWAYS , { 'a', 'z' }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }, { 0x0130, 0, 0 }, { 0x0069, 0, 0 }}, -#line 18 "lib/unicase/special-casing-table.gperf" +#line 18 "./unicase/special-casing-table.gperf" {"\000I\003", 1, SCC_ALWAYS , { 't', 'r' }, { 0x0049, 0, 0 }, { 0x0069, 0, 0 }, { 0x0049, 0, 0 }, { 0x0131, 0, 0 }}, -#line 122 "lib/unicase/special-casing-table.gperf" +#line 122 "./unicase/special-casing-table.gperf" {"\037\366\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A9, 0x0342, 0 }, { 0x1FF6, 0, 0 }, { 0x03A9, 0x0342, 0 }, { 0x03C9, 0x0342, 0 }}, -#line 121 "lib/unicase/special-casing-table.gperf" +#line 121 "./unicase/special-casing-table.gperf" {"\037\364\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x038F, 0x0399, 0 }, { 0x1FF4, 0, 0 }, { 0x038F, 0x0345, 0 }, { 0x03CE, 0x03B9, 0 }}, -#line 39 "lib/unicase/special-casing-table.gperf" +#line 39 "./unicase/special-casing-table.gperf" {"\005\207\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0535, 0x0552, 0 }, { 0x0587, 0, 0 }, { 0x0535, 0x0582, 0 }, { 0x0565, 0x0582, 0 }}, -#line 120 "lib/unicase/special-casing-table.gperf" +#line 120 "./unicase/special-casing-table.gperf" {"\037\363\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A9, 0x0399, 0 }, { 0x1FF3, 0, 0 }, { 0x1FFC, 0, 0 }, { 0x03C9, 0x03B9, 0 }}, -#line 119 "lib/unicase/special-casing-table.gperf" +#line 119 "./unicase/special-casing-table.gperf" {"\037\362\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1FFA, 0x0399, 0 }, { 0x1FF2, 0, 0 }, { 0x1FFA, 0x0345, 0 }, { 0x1F7C, 0x03B9, 0 }}, -#line 32 "lib/unicase/special-casing-table.gperf" +#line 32 "./unicase/special-casing-table.gperf" {"\001\360\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x004A, 0x030C, 0 }, { 0x01F0, 0, 0 }, { 0x004A, 0x030C, 0 }, { 0x006A, 0x030C, 0 }}, -#line 118 "lib/unicase/special-casing-table.gperf" +#line 118 "./unicase/special-casing-table.gperf" {"\037\347\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0308, 0x0342 }, { 0x1FE7, 0, 0 }, { 0x03A5, 0x0308, 0x0342 }, { 0x03C5, 0x0308, 0x0342 }}, -#line 117 "lib/unicase/special-casing-table.gperf" +#line 117 "./unicase/special-casing-table.gperf" {"\037\346\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0342, 0 }, { 0x1FE6, 0, 0 }, { 0x03A5, 0x0342, 0 }, { 0x03C5, 0x0342, 0 }}, -#line 116 "lib/unicase/special-casing-table.gperf" +#line 116 "./unicase/special-casing-table.gperf" {"\037\344\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A1, 0x0313, 0 }, { 0x1FE4, 0, 0 }, { 0x03A1, 0x0313, 0 }, { 0x03C1, 0x0313, 0 }}, -#line 115 "lib/unicase/special-casing-table.gperf" +#line 115 "./unicase/special-casing-table.gperf" {"\037\343\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0308, 0x0301 }, { 0x1FE3, 0, 0 }, { 0x03A5, 0x0308, 0x0301 }, { 0x03C5, 0x0308, 0x0301 }}, -#line 114 "lib/unicase/special-casing-table.gperf" +#line 114 "./unicase/special-casing-table.gperf" {"\037\342\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0308, 0x0300 }, { 0x1FE2, 0, 0 }, { 0x03A5, 0x0308, 0x0300 }, { 0x03C5, 0x0308, 0x0300 }}, -#line 25 "lib/unicase/special-casing-table.gperf" +#line 25 "./unicase/special-casing-table.gperf" {"\000\337\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0053, 0x0053, 0 }, { 0x00DF, 0, 0 }, { 0x0053, 0x0073, 0 }, { 0x0073, 0x0073, 0 }}, -#line 113 "lib/unicase/special-casing-table.gperf" +#line 113 "./unicase/special-casing-table.gperf" {"\037\327\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0399, 0x0308, 0x0342 }, { 0x1FD7, 0, 0 }, { 0x0399, 0x0308, 0x0342 }, { 0x03B9, 0x0308, 0x0342 }}, -#line 112 "lib/unicase/special-casing-table.gperf" +#line 112 "./unicase/special-casing-table.gperf" {"\037\326\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0399, 0x0342, 0 }, { 0x1FD6, 0, 0 }, { 0x0399, 0x0342, 0 }, { 0x03B9, 0x0342, 0 }}, -#line 111 "lib/unicase/special-casing-table.gperf" +#line 111 "./unicase/special-casing-table.gperf" {"\037\323\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0399, 0x0308, 0x0301 }, { 0x1FD3, 0, 0 }, { 0x0399, 0x0308, 0x0301 }, { 0x03B9, 0x0308, 0x0301 }}, -#line 110 "lib/unicase/special-casing-table.gperf" +#line 110 "./unicase/special-casing-table.gperf" {"\037\322\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0399, 0x0308, 0x0300 }, { 0x1FD2, 0, 0 }, { 0x0399, 0x0308, 0x0300 }, { 0x03B9, 0x0308, 0x0300 }}, -#line 24 "lib/unicase/special-casing-table.gperf" +#line 24 "./unicase/special-casing-table.gperf" {"\000\315\000", 0, SCC_ALWAYS , { 'l', 't' }, { 0x00CD, 0, 0 }, { 0x0069, 0x0307, 0x0301 }, { 0x00CD, 0, 0 }, { 0x00ED, 0, 0 }}, -#line 108 "lib/unicase/special-casing-table.gperf" +#line 108 "./unicase/special-casing-table.gperf" {"\037\307\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0397, 0x0342, 0x0399 }, { 0x1FC7, 0, 0 }, { 0x0397, 0x0342, 0x0345 }, { 0x03B7, 0x0342, 0x03B9 }}, -#line 107 "lib/unicase/special-casing-table.gperf" +#line 107 "./unicase/special-casing-table.gperf" {"\037\306\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0397, 0x0342, 0 }, { 0x1FC6, 0, 0 }, { 0x0397, 0x0342, 0 }, { 0x03B7, 0x0342, 0 }}, -#line 106 "lib/unicase/special-casing-table.gperf" +#line 106 "./unicase/special-casing-table.gperf" {"\037\304\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0389, 0x0399, 0 }, { 0x1FC4, 0, 0 }, { 0x0389, 0x0345, 0 }, { 0x03AE, 0x03B9, 0 }}, -#line 105 "lib/unicase/special-casing-table.gperf" +#line 105 "./unicase/special-casing-table.gperf" {"\037\303\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0397, 0x0399, 0 }, { 0x1FC3, 0, 0 }, { 0x1FCC, 0, 0 }, { 0x03B7, 0x03B9, 0 }}, -#line 104 "lib/unicase/special-casing-table.gperf" +#line 104 "./unicase/special-casing-table.gperf" {"\037\302\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1FCA, 0x0399, 0 }, { 0x1FC2, 0, 0 }, { 0x1FCA, 0x0345, 0 }, { 0x1F74, 0x03B9, 0 }}, -#line 103 "lib/unicase/special-casing-table.gperf" +#line 103 "./unicase/special-casing-table.gperf" {"\037\274\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0391, 0x0399, 0 }, { 0x1FB3, 0, 0 }, { 0x1FBC, 0, 0 }, { 0x03B1, 0x03B9, 0 }}, -#line 102 "lib/unicase/special-casing-table.gperf" +#line 102 "./unicase/special-casing-table.gperf" {"\037\267\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0391, 0x0342, 0x0399 }, { 0x1FB7, 0, 0 }, { 0x0391, 0x0342, 0x0345 }, { 0x03B1, 0x0342, 0x03B9 }}, -#line 101 "lib/unicase/special-casing-table.gperf" +#line 101 "./unicase/special-casing-table.gperf" {"\037\266\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0391, 0x0342, 0 }, { 0x1FB6, 0, 0 }, { 0x0391, 0x0342, 0 }, { 0x03B1, 0x0342, 0 }}, -#line 100 "lib/unicase/special-casing-table.gperf" +#line 100 "./unicase/special-casing-table.gperf" {"\037\264\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0386, 0x0399, 0 }, { 0x1FB4, 0, 0 }, { 0x0386, 0x0345, 0 }, { 0x03AC, 0x03B9, 0 }}, -#line 99 "lib/unicase/special-casing-table.gperf" +#line 99 "./unicase/special-casing-table.gperf" {"\037\263\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0391, 0x0399, 0 }, { 0x1FB3, 0, 0 }, { 0x1FBC, 0, 0 }, { 0x03B1, 0x03B9, 0 }}, -#line 98 "lib/unicase/special-casing-table.gperf" +#line 98 "./unicase/special-casing-table.gperf" {"\037\262\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1FBA, 0x0399, 0 }, { 0x1FB2, 0, 0 }, { 0x1FBA, 0x0345, 0 }, { 0x1F70, 0x03B9, 0 }}, -#line 38 "lib/unicase/special-casing-table.gperf" +#line 38 "./unicase/special-casing-table.gperf" {"\003\260\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0308, 0x0301 }, { 0x03B0, 0, 0 }, { 0x03A5, 0x0308, 0x0301 }, { 0x03C5, 0x0308, 0x0301 }}, -#line 97 "lib/unicase/special-casing-table.gperf" +#line 97 "./unicase/special-casing-table.gperf" {"\037\257\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6F, 0x0399, 0 }, { 0x1FA7, 0, 0 }, { 0x1FAF, 0, 0 }, { 0x1F67, 0x03B9, 0 }}, -#line 96 "lib/unicase/special-casing-table.gperf" +#line 96 "./unicase/special-casing-table.gperf" {"\037\256\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6E, 0x0399, 0 }, { 0x1FA6, 0, 0 }, { 0x1FAE, 0, 0 }, { 0x1F66, 0x03B9, 0 }}, -#line 95 "lib/unicase/special-casing-table.gperf" +#line 95 "./unicase/special-casing-table.gperf" {"\037\255\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6D, 0x0399, 0 }, { 0x1FA5, 0, 0 }, { 0x1FAD, 0, 0 }, { 0x1F65, 0x03B9, 0 }}, -#line 94 "lib/unicase/special-casing-table.gperf" +#line 94 "./unicase/special-casing-table.gperf" {"\037\254\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6C, 0x0399, 0 }, { 0x1FA4, 0, 0 }, { 0x1FAC, 0, 0 }, { 0x1F64, 0x03B9, 0 }}, -#line 93 "lib/unicase/special-casing-table.gperf" +#line 93 "./unicase/special-casing-table.gperf" {"\037\253\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6B, 0x0399, 0 }, { 0x1FA3, 0, 0 }, { 0x1FAB, 0, 0 }, { 0x1F63, 0x03B9, 0 }}, -#line 92 "lib/unicase/special-casing-table.gperf" +#line 92 "./unicase/special-casing-table.gperf" {"\037\252\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6A, 0x0399, 0 }, { 0x1FA2, 0, 0 }, { 0x1FAA, 0, 0 }, { 0x1F62, 0x03B9, 0 }}, -#line 91 "lib/unicase/special-casing-table.gperf" +#line 91 "./unicase/special-casing-table.gperf" {"\037\251\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F69, 0x0399, 0 }, { 0x1FA1, 0, 0 }, { 0x1FA9, 0, 0 }, { 0x1F61, 0x03B9, 0 }}, -#line 90 "lib/unicase/special-casing-table.gperf" +#line 90 "./unicase/special-casing-table.gperf" {"\037\250\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F68, 0x0399, 0 }, { 0x1FA0, 0, 0 }, { 0x1FA8, 0, 0 }, { 0x1F60, 0x03B9, 0 }}, -#line 89 "lib/unicase/special-casing-table.gperf" +#line 89 "./unicase/special-casing-table.gperf" {"\037\247\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6F, 0x0399, 0 }, { 0x1FA7, 0, 0 }, { 0x1FAF, 0, 0 }, { 0x1F67, 0x03B9, 0 }}, -#line 88 "lib/unicase/special-casing-table.gperf" +#line 88 "./unicase/special-casing-table.gperf" {"\037\246\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6E, 0x0399, 0 }, { 0x1FA6, 0, 0 }, { 0x1FAE, 0, 0 }, { 0x1F66, 0x03B9, 0 }}, -#line 87 "lib/unicase/special-casing-table.gperf" +#line 87 "./unicase/special-casing-table.gperf" {"\037\245\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6D, 0x0399, 0 }, { 0x1FA5, 0, 0 }, { 0x1FAD, 0, 0 }, { 0x1F65, 0x03B9, 0 }}, -#line 86 "lib/unicase/special-casing-table.gperf" +#line 86 "./unicase/special-casing-table.gperf" {"\037\244\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6C, 0x0399, 0 }, { 0x1FA4, 0, 0 }, { 0x1FAC, 0, 0 }, { 0x1F64, 0x03B9, 0 }}, -#line 84 "lib/unicase/special-casing-table.gperf" +#line 84 "./unicase/special-casing-table.gperf" {"\037\242\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F6A, 0x0399, 0 }, { 0x1FA2, 0, 0 }, { 0x1FAA, 0, 0 }, { 0x1F62, 0x03B9, 0 }}, -#line 83 "lib/unicase/special-casing-table.gperf" +#line 83 "./unicase/special-casing-table.gperf" {"\037\241\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F69, 0x0399, 0 }, { 0x1FA1, 0, 0 }, { 0x1FA9, 0, 0 }, { 0x1F61, 0x03B9, 0 }}, -#line 82 "lib/unicase/special-casing-table.gperf" +#line 82 "./unicase/special-casing-table.gperf" {"\037\240\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F68, 0x0399, 0 }, { 0x1FA0, 0, 0 }, { 0x1FA8, 0, 0 }, { 0x1F60, 0x03B9, 0 }}, -#line 81 "lib/unicase/special-casing-table.gperf" +#line 81 "./unicase/special-casing-table.gperf" {"\037\237\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2F, 0x0399, 0 }, { 0x1F97, 0, 0 }, { 0x1F9F, 0, 0 }, { 0x1F27, 0x03B9, 0 }}, -#line 79 "lib/unicase/special-casing-table.gperf" +#line 79 "./unicase/special-casing-table.gperf" {"\037\235\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2D, 0x0399, 0 }, { 0x1F95, 0, 0 }, { 0x1F9D, 0, 0 }, { 0x1F25, 0x03B9, 0 }}, -#line 78 "lib/unicase/special-casing-table.gperf" +#line 78 "./unicase/special-casing-table.gperf" {"\037\234\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2C, 0x0399, 0 }, { 0x1F94, 0, 0 }, { 0x1F9C, 0, 0 }, { 0x1F24, 0x03B9, 0 }}, -#line 77 "lib/unicase/special-casing-table.gperf" +#line 77 "./unicase/special-casing-table.gperf" {"\037\233\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2B, 0x0399, 0 }, { 0x1F93, 0, 0 }, { 0x1F9B, 0, 0 }, { 0x1F23, 0x03B9, 0 }}, -#line 71 "lib/unicase/special-casing-table.gperf" +#line 71 "./unicase/special-casing-table.gperf" {"\037\225\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2D, 0x0399, 0 }, { 0x1F95, 0, 0 }, { 0x1F9D, 0, 0 }, { 0x1F25, 0x03B9, 0 }}, -#line 70 "lib/unicase/special-casing-table.gperf" +#line 70 "./unicase/special-casing-table.gperf" {"\037\224\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2C, 0x0399, 0 }, { 0x1F94, 0, 0 }, { 0x1F9C, 0, 0 }, { 0x1F24, 0x03B9, 0 }}, -#line 69 "lib/unicase/special-casing-table.gperf" +#line 69 "./unicase/special-casing-table.gperf" {"\037\223\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2B, 0x0399, 0 }, { 0x1F93, 0, 0 }, { 0x1F9B, 0, 0 }, { 0x1F23, 0x03B9, 0 }}, -#line 68 "lib/unicase/special-casing-table.gperf" +#line 68 "./unicase/special-casing-table.gperf" {"\037\222\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F2A, 0x0399, 0 }, { 0x1F92, 0, 0 }, { 0x1F9A, 0, 0 }, { 0x1F22, 0x03B9, 0 }}, -#line 67 "lib/unicase/special-casing-table.gperf" +#line 67 "./unicase/special-casing-table.gperf" {"\037\221\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F29, 0x0399, 0 }, { 0x1F91, 0, 0 }, { 0x1F99, 0, 0 }, { 0x1F21, 0x03B9, 0 }}, -#line 65 "lib/unicase/special-casing-table.gperf" +#line 65 "./unicase/special-casing-table.gperf" {"\037\217\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0F, 0x0399, 0 }, { 0x1F87, 0, 0 }, { 0x1F8F, 0, 0 }, { 0x1F07, 0x03B9, 0 }}, -#line 64 "lib/unicase/special-casing-table.gperf" +#line 64 "./unicase/special-casing-table.gperf" {"\037\216\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0E, 0x0399, 0 }, { 0x1F86, 0, 0 }, { 0x1F8E, 0, 0 }, { 0x1F06, 0x03B9, 0 }}, -#line 63 "lib/unicase/special-casing-table.gperf" +#line 63 "./unicase/special-casing-table.gperf" {"\037\215\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0D, 0x0399, 0 }, { 0x1F85, 0, 0 }, { 0x1F8D, 0, 0 }, { 0x1F05, 0x03B9, 0 }}, -#line 62 "lib/unicase/special-casing-table.gperf" +#line 62 "./unicase/special-casing-table.gperf" {"\037\214\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0C, 0x0399, 0 }, { 0x1F84, 0, 0 }, { 0x1F8C, 0, 0 }, { 0x1F04, 0x03B9, 0 }}, -#line 61 "lib/unicase/special-casing-table.gperf" +#line 61 "./unicase/special-casing-table.gperf" {"\037\213\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0B, 0x0399, 0 }, { 0x1F83, 0, 0 }, { 0x1F8B, 0, 0 }, { 0x1F03, 0x03B9, 0 }}, -#line 60 "lib/unicase/special-casing-table.gperf" +#line 60 "./unicase/special-casing-table.gperf" {"\037\212\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0A, 0x0399, 0 }, { 0x1F82, 0, 0 }, { 0x1F8A, 0, 0 }, { 0x1F02, 0x03B9, 0 }}, -#line 59 "lib/unicase/special-casing-table.gperf" +#line 59 "./unicase/special-casing-table.gperf" {"\037\211\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F09, 0x0399, 0 }, { 0x1F81, 0, 0 }, { 0x1F89, 0, 0 }, { 0x1F01, 0x03B9, 0 }}, -#line 58 "lib/unicase/special-casing-table.gperf" +#line 58 "./unicase/special-casing-table.gperf" {"\037\210\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F08, 0x0399, 0 }, { 0x1F80, 0, 0 }, { 0x1F88, 0, 0 }, { 0x1F00, 0x03B9, 0 }}, -#line 56 "lib/unicase/special-casing-table.gperf" +#line 56 "./unicase/special-casing-table.gperf" {"\037\206\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0E, 0x0399, 0 }, { 0x1F86, 0, 0 }, { 0x1F8E, 0, 0 }, { 0x1F06, 0x03B9, 0 }}, -#line 55 "lib/unicase/special-casing-table.gperf" +#line 55 "./unicase/special-casing-table.gperf" {"\037\205\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0D, 0x0399, 0 }, { 0x1F85, 0, 0 }, { 0x1F8D, 0, 0 }, { 0x1F05, 0x03B9, 0 }}, -#line 54 "lib/unicase/special-casing-table.gperf" +#line 54 "./unicase/special-casing-table.gperf" {"\037\204\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0C, 0x0399, 0 }, { 0x1F84, 0, 0 }, { 0x1F8C, 0, 0 }, { 0x1F04, 0x03B9, 0 }}, -#line 53 "lib/unicase/special-casing-table.gperf" +#line 53 "./unicase/special-casing-table.gperf" {"\037\203\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0B, 0x0399, 0 }, { 0x1F83, 0, 0 }, { 0x1F8B, 0, 0 }, { 0x1F03, 0x03B9, 0 }}, -#line 52 "lib/unicase/special-casing-table.gperf" +#line 52 "./unicase/special-casing-table.gperf" {"\037\202\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F0A, 0x0399, 0 }, { 0x1F82, 0, 0 }, { 0x1F8A, 0, 0 }, { 0x1F02, 0x03B9, 0 }}, -#line 51 "lib/unicase/special-casing-table.gperf" +#line 51 "./unicase/special-casing-table.gperf" {"\037\201\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F09, 0x0399, 0 }, { 0x1F81, 0, 0 }, { 0x1F89, 0, 0 }, { 0x1F01, 0x03B9, 0 }}, -#line 50 "lib/unicase/special-casing-table.gperf" +#line 50 "./unicase/special-casing-table.gperf" {"\037\200\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x1F08, 0x0399, 0 }, { 0x1F80, 0, 0 }, { 0x1F88, 0, 0 }, { 0x1F00, 0x03B9, 0 }}, -#line 49 "lib/unicase/special-casing-table.gperf" +#line 49 "./unicase/special-casing-table.gperf" {"\037V\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0313, 0x0342 }, { 0x1F56, 0, 0 }, { 0x03A5, 0x0313, 0x0342 }, { 0x03C5, 0x0313, 0x0342 }}, -#line 48 "lib/unicase/special-casing-table.gperf" +#line 48 "./unicase/special-casing-table.gperf" {"\037T\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0313, 0x0301 }, { 0x1F54, 0, 0 }, { 0x03A5, 0x0313, 0x0301 }, { 0x03C5, 0x0313, 0x0301 }}, -#line 47 "lib/unicase/special-casing-table.gperf" +#line 47 "./unicase/special-casing-table.gperf" {"\037R\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0313, 0x0300 }, { 0x1F52, 0, 0 }, { 0x03A5, 0x0313, 0x0300 }, { 0x03C5, 0x0313, 0x0300 }}, -#line 46 "lib/unicase/special-casing-table.gperf" +#line 46 "./unicase/special-casing-table.gperf" {"\037P\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x03A5, 0x0313, 0 }, { 0x1F50, 0, 0 }, { 0x03A5, 0x0313, 0 }, { 0x03C5, 0x0313, 0 }}, -#line 20 "lib/unicase/special-casing-table.gperf" +#line 20 "./unicase/special-casing-table.gperf" {"\000J\000", 0, SCC_MORE_ABOVE , { 'l', 't' }, { 0x004A, 0, 0 }, { 0x006A, 0x0307, 0 }, { 0x004A, 0, 0 }, { 0x006A, 0, 0 }}, -#line 27 "lib/unicase/special-casing-table.gperf" +#line 27 "./unicase/special-casing-table.gperf" {"\001.\000", 0, SCC_MORE_ABOVE , { 'l', 't' }, { 0x012E, 0, 0 }, { 0x012F, 0x0307, 0 }, { 0x012E, 0, 0 }, { 0x012F, 0, 0 }}, -#line 26 "lib/unicase/special-casing-table.gperf" +#line 26 "./unicase/special-casing-table.gperf" {"\001(\000", 0, SCC_ALWAYS , { 'l', 't' }, { 0x0128, 0, 0 }, { 0x0069, 0x0307, 0x0303 }, { 0x0128, 0, 0 }, { 0x0129, 0, 0 }}, -#line 136 "lib/unicase/special-casing-table.gperf" +#line 136 "./unicase/special-casing-table.gperf" {"\373\027\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0544, 0x053D, 0 }, { 0xFB17, 0, 0 }, { 0x0544, 0x056D, 0 }, { 0x0574, 0x056D, 0 }}, -#line 135 "lib/unicase/special-casing-table.gperf" +#line 135 "./unicase/special-casing-table.gperf" {"\373\026\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x054E, 0x0546, 0 }, { 0xFB16, 0, 0 }, { 0x054E, 0x0576, 0 }, { 0x057E, 0x0576, 0 }}, -#line 134 "lib/unicase/special-casing-table.gperf" +#line 134 "./unicase/special-casing-table.gperf" {"\373\025\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0544, 0x053B, 0 }, { 0xFB15, 0, 0 }, { 0x0544, 0x056B, 0 }, { 0x0574, 0x056B, 0 }}, -#line 133 "lib/unicase/special-casing-table.gperf" +#line 133 "./unicase/special-casing-table.gperf" {"\373\024\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0544, 0x0535, 0 }, { 0xFB14, 0, 0 }, { 0x0544, 0x0565, 0 }, { 0x0574, 0x0565, 0 }}, -#line 132 "lib/unicase/special-casing-table.gperf" +#line 132 "./unicase/special-casing-table.gperf" {"\373\023\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0544, 0x0546, 0 }, { 0xFB13, 0, 0 }, { 0x0544, 0x0576, 0 }, { 0x0574, 0x0576, 0 }}, -#line 131 "lib/unicase/special-casing-table.gperf" +#line 131 "./unicase/special-casing-table.gperf" {"\373\006\000", 0, SCC_ALWAYS , { '\0', '\0' }, { 0x0053, 0x0054, 0 }, { 0xFB06, 0, 0 }, { 0x0053, 0x0074, 0 }, { 0x0073, 0x0074, 0 }} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { - register int key = gl_unicase_special_hash (str, len); + register unsigned int key = gl_unicase_special_hash (str, len); - if (key <= MAX_HASH_VALUE && key >= 0) + if (key <= MAX_HASH_VALUE) if (len == lengthtable[key]) { register const char *s = wordlist[key].code; diff --git a/lib/unicase/special-casing.c b/lib/unicase/special-casing.c index 8186e63..5deee94 100644 --- a/lib/unicase/special-casing.c +++ b/lib/unicase/special-casing.c @@ -1,5 +1,5 @@ /* Special casing table. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,12 +13,12 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include /* Specification. */ -#include "special-casing.h" +#include "unicase/special-casing.h" #include diff --git a/lib/unicase/special-casing.h b/lib/unicase/special-casing.h deleted file mode 100644 index 1a72acf..0000000 --- a/lib/unicase/special-casing.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Special casing table. - Copyright (C) 2009-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2009. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#include - -/* A special casing context. - A context is negated through x -> -x. */ -enum -{ - SCC_ALWAYS = 0, - SCC_FINAL_SIGMA = 1, - SCC_AFTER_SOFT_DOTTED = 2, - SCC_MORE_ABOVE = 3, - SCC_BEFORE_DOT = 4, - SCC_AFTER_I = 5 -}; - -struct special_casing_rule -{ - /* The first two bytes are the code, in big-endian order. The third byte - only distinguishes different rules pertaining to the same code. */ - /*unsigned*/ char code[3]; - - /* True when this rule is not the last one for the given code. */ - /*bool*/ unsigned int has_next : 1; - - /* Context. */ - signed int context : 7; - - /* Language, or an empty string. */ - char language[2]; - - /* Mapping to upper case. Between 0 and 3 characters. Filled with 0s. */ - unsigned short upper[3]; - - /* Mapping to lower case. Between 0 and 3 characters. Filled with 0s. */ - unsigned short lower[3]; - - /* Mapping to title case. Between 0 and 3 characters. Filled with 0s. */ - unsigned short title[3]; - - /* Casefolding mapping. Between 0 and 3 characters. Filled with 0s. */ - unsigned short casefold[3]; -}; - -extern const struct special_casing_rule * - gl_unicase_special_lookup (const char *str, size_t len); diff --git a/lib/unicase/special-casing.in.h b/lib/unicase/special-casing.in.h new file mode 100644 index 0000000..9672f97 --- /dev/null +++ b/lib/unicase/special-casing.in.h @@ -0,0 +1,61 @@ +/* Special casing table. + Copyright (C) 2009-2018 Free Software Foundation, Inc. + Written by Bruno Haible , 2009. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* A special casing context. + A context is negated through x -> -x. */ +enum +{ + SCC_ALWAYS = 0, + SCC_FINAL_SIGMA = 1, + SCC_AFTER_SOFT_DOTTED = 2, + SCC_MORE_ABOVE = 3, + SCC_BEFORE_DOT = 4, + SCC_AFTER_I = 5 +}; + +struct special_casing_rule +{ + /* The first two bytes are the code, in big-endian order. The third byte + only distinguishes different rules pertaining to the same code. */ + /*unsigned*/ char code[3]; + + /* True when this rule is not the last one for the given code. */ + /*bool*/ unsigned int has_next : 1; + + /* Context. */ + signed int context : 7; + + /* Language, or an empty string. */ + char language[2]; + + /* Mapping to upper case. Between 0 and 3 characters. Filled with 0s. */ + unsigned short upper[3]; + + /* Mapping to lower case. Between 0 and 3 characters. Filled with 0s. */ + unsigned short lower[3]; + + /* Mapping to title case. Between 0 and 3 characters. Filled with 0s. */ + unsigned short title[3]; + + /* Casefolding mapping. Between 0 and 3 characters. Filled with 0s. */ + unsigned short casefold[3]; +}; + +extern const struct special_casing_rule * + gl_unicase_special_lookup (const char *str, size_t len); diff --git a/lib/unicase/tolower.c b/lib/unicase/tolower.c index 866741e..55c5f1c 100644 --- a/lib/unicase/tolower.c +++ b/lib/unicase/tolower.c @@ -1,5 +1,5 @@ /* Lowercase mapping for Unicode characters (locale and context independent). - Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unicase/tolower.h b/lib/unicase/tolower.h index 97ba6ed..6795557 100644 --- a/lib/unicase/tolower.h +++ b/lib/unicase/tolower.h @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Simple character mapping of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ #define mapping_header_0 16 #define mapping_header_1 2 #define mapping_header_2 7 @@ -11,7 +11,7 @@ struct { int level1[2]; short level2[2 << 9]; - int level3[29 << 7]; + int level3[31 << 7]; } u_mapping = { @@ -82,14 +82,12 @@ u_mapping = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3200, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 3328, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, 3456, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + 3328, 3456, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3584, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 3712, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -141,6 +139,8 @@ u_mapping = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 3840, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -536,7 +536,7 @@ u_mapping = 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, -42308, -42319, -42315, -42305, 0, 0, + 1, 0, -42308, -42319, -42315, -42305, -42308, 0, -42258, -42282, -42261, 928, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -579,6 +579,22 @@ u_mapping = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, @@ -603,6 +619,22 @@ u_mapping = 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/lib/unicase/u-casemap.h b/lib/unicase/u-casemap.h index 2ad6b16..adf77ca 100644 --- a/lib/unicase/u-casemap.h +++ b/lib/unicase/u-casemap.h @@ -1,5 +1,5 @@ /* Case mapping for UTF-8/UTF-16/UTF-32 strings (locale dependent). - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ UNIT * FUNC (const UNIT *s, size_t n, diff --git a/lib/unicase/u8-casemap.c b/lib/unicase/u8-casemap.c index 55aaa6a..4562843 100644 --- a/lib/unicase/u8-casemap.c +++ b/lib/unicase/u8-casemap.c @@ -1,5 +1,5 @@ /* Case mapping for UTF-8 strings (locale dependent). - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -29,7 +29,7 @@ #include "uninorm.h" #include "caseprop.h" #include "context.h" -#include "special-casing.h" +#include "unicase/special-casing.h" #define FUNC u8_casemap #define UNIT uint8_t diff --git a/lib/unicase/u8-tolower.c b/lib/unicase/u8-tolower.c index 0c2792a..ed7e8de 100644 --- a/lib/unicase/u8-tolower.c +++ b/lib/unicase/u8-tolower.c @@ -1,5 +1,5 @@ /* Lowercase mapping for UTF-8 strings (locale dependent). - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -23,7 +23,7 @@ #include #include "unicasemap.h" -#include "special-casing.h" +#include "unicase/special-casing.h" uint8_t * u8_tolower (const uint8_t *s, size_t n, const char *iso639_language, diff --git a/lib/unicase/unicasemap.h b/lib/unicase/unicasemap.h index 68fdeba..3b29587 100644 --- a/lib/unicase/unicasemap.h +++ b/lib/unicase/unicasemap.h @@ -1,5 +1,5 @@ /* Case mapping for UTF-8/UTF-16/UTF-32 strings (locale dependent). - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unictype.in.h b/lib/unictype.in.h index 7fdc304..067cefd 100644 --- a/lib/unictype.in.h +++ b/lib/unictype.in.h @@ -1,5 +1,5 @@ /* Unicode character classification and properties. - Copyright (C) 2002, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNICTYPE_H #define _UNICTYPE_H @@ -551,7 +551,10 @@ enum UC_JOINING_GROUP_MANICHAEAN_FIVE, /* Manichaean_Five */ UC_JOINING_GROUP_MANICHAEAN_TEN, /* Manichaean_Ten */ UC_JOINING_GROUP_MANICHAEAN_TWENTY, /* Manichaean_Twenty */ - UC_JOINING_GROUP_MANICHAEAN_HUNDRED /* Manichaean_Hundred */ + UC_JOINING_GROUP_MANICHAEAN_HUNDRED, /* Manichaean_Hundred */ + UC_JOINING_GROUP_AFRICAN_FEH, /* African_Feh */ + UC_JOINING_GROUP_AFRICAN_QAF, /* African_Qaf */ + UC_JOINING_GROUP_AFRICAN_NOON /* African_Noon */ }; /* Return the name of a joining group. */ diff --git a/lib/unictype/bitmap.h b/lib/unictype/bitmap.h index 475166f..45dbafa 100644 --- a/lib/unictype/bitmap.h +++ b/lib/unictype/bitmap.h @@ -1,5 +1,5 @@ /* Three-level bitmap lookup. - Copyright (C) 2000-2002, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2005-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2000-2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ static inline int bitmap_lookup (const void *table, ucs4_t uc); diff --git a/lib/unictype/combiningclass.c b/lib/unictype/combiningclass.c index fa90b6e..81b5001 100644 --- a/lib/unictype/combiningclass.c +++ b/lib/unictype/combiningclass.c @@ -1,5 +1,5 @@ /* Combining classes of Unicode characters. - Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unictype/combiningclass.h b/lib/unictype/combiningclass.h index 4c91aa6..ddfe9b0 100644 --- a/lib/unictype/combiningclass.h +++ b/lib/unictype/combiningclass.h @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Combining class of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ #define combclass_header_0 16 #define combclass_header_1 2 #define combclass_header_2 7 @@ -11,7 +11,7 @@ struct { int level1[2]; short level2[2 << 9]; - unsigned char level3[72 << 7]; + unsigned char level3[75 << 7]; } u_combclass = { @@ -86,8 +86,9 @@ u_combclass = -1, -1, -1, -1, 6528, 6656, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6784, 6912, 7040, 7168, 7296, 7424, 7552, -1, - -1, 7680, -1, 7808, 7936, 8064, 8192, -1, + 7680, 7808, -1, 7936, 8064, 8192, 8320, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 8064, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -106,8 +107,8 @@ u_combclass = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 8448, 8576, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 8320, 8448, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -127,19 +128,18 @@ u_combclass = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 8704, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 8576, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 8832, 8960, 9088, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 8704, 8832, 8960, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 9216, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, 9088, -1, -1, -1, -1, -1, -1, + -1, 9344, 9472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -285,9 +285,9 @@ u_combclass = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 220, 230, 230, 220, 230, + 0, 0, 0, 0, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 0, 220, 230, 230, 220, 230, 230, 220, 230, 230, 230, 220, 220, 220, 27, 28, 29, 230, 230, 230, 220, 230, 230, 220, 220, 230, 230, 230, 230, 230, @@ -658,7 +658,7 @@ u_combclass = 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 0, 0, - 0, 0, 0, 0, 233, 220, 230, 220, + 0, 0, 0, 230, 233, 220, 230, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1106,6 +1106,22 @@ u_combclass = 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 230, 230, 230, 0, 0, 0, 230, 230, 230, 230, 230, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1283,6 +1299,22 @@ u_combclass = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 230, 230, 230, 230, 230, 230, 230, 0, + 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, + 230, 0, 0, 230, 230, 230, 230, 230, + 230, 230, 0, 230, 230, 0, 230, 230, + 230, 230, 230, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1294,6 +1326,22 @@ u_combclass = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 220, 220, 220, 220, 220, 220, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 230, 230, 230, 230, + 230, 230, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/lib/unictype/pr_soft_dotted.c b/lib/unictype/pr_soft_dotted.c index 3914df1..5fa3c5f 100644 --- a/lib/unictype/pr_soft_dotted.c +++ b/lib/unictype/pr_soft_dotted.c @@ -1,5 +1,5 @@ /* Properties of Unicode characters. - Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unictype/pr_soft_dotted.h b/lib/unictype/pr_soft_dotted.h index 28f6885..2c81721 100644 --- a/lib/unictype/pr_soft_dotted.h +++ b/lib/unictype/pr_soft_dotted.h @@ -1,6 +1,6 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Properties of Unicode characters. */ -/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */ +/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0. */ #define header_0 16 #define header_2 9 #define header_3 127 diff --git a/lib/uninorm.in.h b/lib/uninorm.in.h index 46f14a6..0ac78e0 100644 --- a/lib/uninorm.in.h +++ b/lib/uninorm.in.h @@ -1,5 +1,5 @@ /* Normalization forms (composition and decomposition) of Unicode strings. - Copyright (C) 2001-2002, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNINORM_H #define _UNINORM_H diff --git a/lib/uninorm/decompose-internal.c b/lib/uninorm/decompose-internal.c index acf5279..e8448d3 100644 --- a/lib/uninorm/decompose-internal.c +++ b/lib/uninorm/decompose-internal.c @@ -1,5 +1,5 @@ /* Decomposition of Unicode strings. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/uninorm/decompose-internal.h b/lib/uninorm/decompose-internal.h index a5a8634..039bf60 100644 --- a/lib/uninorm/decompose-internal.h +++ b/lib/uninorm/decompose-internal.h @@ -1,5 +1,5 @@ /* Decomposition of Unicode strings. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/uninorm/normalize-internal.h b/lib/uninorm/normalize-internal.h index c31d2a8..ed41695 100644 --- a/lib/uninorm/normalize-internal.h +++ b/lib/uninorm/normalize-internal.h @@ -1,5 +1,5 @@ /* Normalization of Unicode strings. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include "unitypes.h" diff --git a/lib/uninorm/u-normalize-internal.h b/lib/uninorm/u-normalize-internal.h index 060263c..86d5e26 100644 --- a/lib/uninorm/u-normalize-internal.h +++ b/lib/uninorm/u-normalize-internal.h @@ -1,5 +1,5 @@ /* Decomposition and composition of Unicode strings. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ UNIT * FUNC (uninorm_t nf, const UNIT *s, size_t n, diff --git a/lib/uninorm/u8-normalize.c b/lib/uninorm/u8-normalize.c index 375d9f7..abdcac4 100644 --- a/lib/uninorm/u8-normalize.c +++ b/lib/uninorm/u8-normalize.c @@ -1,5 +1,5 @@ /* Normalization of UTF-8 strings. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistd--.h b/lib/unistd--.h index dd1f068..a6c5266 100644 --- a/lib/unistd--.h +++ b/lib/unistd--.h @@ -1,6 +1,6 @@ /* Like unistd.h, but redefine some names to avoid glitches. - Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h index 7830200..5baf339 100644 --- a/lib/unistd-safer.h +++ b/lib/unistd-safer.h @@ -1,6 +1,6 @@ /* Invoke unistd-like functions, but avoid some glitches. - Copyright (C) 2001, 2003, 2005, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert and Eric Blake. */ diff --git a/lib/unistd.in.h b/lib/unistd.in.h index d5fa34d..ae59cb2 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_UNISTD_H @@ -127,11 +127,17 @@ # include #endif -/* Get getopt(), optarg, optind, opterr, optopt. - But avoid namespace pollution on glibc systems. */ -#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT -# define __need_getopt -# include +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + +/* Get getopt(), optarg, optind, opterr, optopt. */ +#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT +# include +# include #endif #ifndef _GL_INLINE_HEADER_BEGIN @@ -142,13 +148,6 @@ _GL_INLINE_HEADER_BEGIN # define _GL_UNISTD_INLINE _GL_INLINE #endif -/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -/* The definition of _GL_ARG_NONNULL is copied here. */ - -/* The definition of _GL_WARN_ON_USE is copied here. */ - - /* Hide some function declarations from . */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ @@ -379,7 +378,7 @@ _GL_WARN_ON_USE (dup2, "dup2 is unportable - " Close NEWFD first if it is open. Return newfd if successful, otherwise -1 and errno set. See the Linux man page at - . */ + . */ # if @HAVE_DUP3@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dup3 rpl_dup3 @@ -462,13 +461,25 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " #if @GNULIB_FACCESSAT@ -# if !@HAVE_FACCESSAT@ +# if @REPLACE_FACCESSAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef faccessat +# define faccessat rpl_faccessat +# endif +_GL_FUNCDECL_RPL (faccessat, int, + (int fd, char const *name, int mode, int flag) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (faccessat, int, + (int fd, char const *name, int mode, int flag)); +# else +# if !@HAVE_FACCESSAT@ _GL_FUNCDECL_SYS (faccessat, int, (int fd, char const *file, int mode, int flag) _GL_ARG_NONNULL ((2))); -# endif +# endif _GL_CXXALIAS_SYS (faccessat, int, (int fd, char const *file, int mode, int flag)); +# endif _GL_CXXALIASWARN (faccessat); #elif defined GNULIB_POSIXCHECK # undef faccessat @@ -1149,7 +1160,7 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - " Store the read-end as fd[0] and the write-end as fd[1]. Return 0 upon success, or -1 with errno set upon failure. See also the Linux man page at - . */ + . */ # if @HAVE_PIPE2@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define pipe2 rpl_pipe2 @@ -1457,6 +1468,36 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - " #endif +#if @GNULIB_TRUNCATE@ +/* Change the size of the file designated by FILENAME to become equal to LENGTH. + Return 0 if successful, otherwise -1 and errno set. + See the POSIX:2008 specification + . */ +# if @REPLACE_TRUNCATE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef truncate +# define truncate rpl_truncate +# endif +_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); +# else +# if !@HAVE_TRUNCATE@ +_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); +# endif +_GL_CXXALIASWARN (truncate); +#elif defined GNULIB_POSIXCHECK +# undef truncate +# if HAVE_RAW_DECL_TRUNCATE +_GL_WARN_ON_USE (truncate, "truncate is unportable - " + "use gnulib module truncate for portability"); +# endif +#endif + + #if @GNULIB_TTYNAME_R@ /* Store at most BUFLEN characters of the pathname of the terminal FD is open on in BUF. Return 0 on success, otherwise an error number. */ diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 0f330af..b0fbce8 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNISTR_H #define _UNISTR_H @@ -137,8 +137,8 @@ extern int The number of available units, N, must be > 0. */ /* Similar to mbtowc(), except that puc and s must not be NULL, n must be > 0, and the NUL character is not treated specially. */ -/* The variants with _safe suffix are safe, even if the library is compiled - without --enable-safety. */ +/* The variants with _unsafe suffix are for backward compatibility with + libunistring versions < 0.9.7. */ #if GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING # if !HAVE_INLINE diff --git a/lib/unistr/u-cpy.h b/lib/unistr/u-cpy.h index 4ebdbde..e45b5c9 100644 --- a/lib/unistr/u-cpy.h +++ b/lib/unistr/u-cpy.h @@ -1,5 +1,5 @@ /* Copy piece of UTF-8/UTF-16/UTF-32 string. - Copyright (C) 1999, 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistr/u8-cpy.c b/lib/unistr/u8-cpy.c index 1ef28fa..ba7283e 100644 --- a/lib/unistr/u8-cpy.c +++ b/lib/unistr/u8-cpy.c @@ -1,5 +1,5 @@ /* Copy piece of UTF-8 string. - Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistr/u8-mbtouc-unsafe-aux.c b/lib/unistr/u8-mbtouc-unsafe-aux.c index 5de9786..9b42cb8 100644 --- a/lib/unistr/u8-mbtouc-unsafe-aux.c +++ b/lib/unistr/u8-mbtouc-unsafe-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistr/u8-mbtouc-unsafe.c b/lib/unistr/u8-mbtouc-unsafe.c index 06ca679..43cf82f 100644 --- a/lib/unistr/u8-mbtouc-unsafe.c +++ b/lib/unistr/u8-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistr/u8-strlen.c b/lib/unistr/u8-strlen.c index bf4dc0e..6d3c09d 100644 --- a/lib/unistr/u8-strlen.c +++ b/lib/unistr/u8-strlen.c @@ -1,5 +1,5 @@ /* Determine length of UTF-8 string. - Copyright (C) 2002, 2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c index 4bfe7fb..dcaa4e8 100644 --- a/lib/unistr/u8-uctomb-aux.c +++ b/lib/unistr/u8-uctomb-aux.c @@ -1,5 +1,5 @@ /* Conversion UCS-4 to UTF-8. - Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,13 +13,21 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include /* Specification. */ #include "unistr.h" +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + int u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n) { @@ -48,9 +56,9 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n) switch (count) /* note: code falls through cases! */ { case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000; - /* fallthrough */ + FALLTHROUGH; case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800; - /* fallthrough */ + FALLTHROUGH; case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0; /*case 1:*/ s[0] = uc; } diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index 685b6f1..ec4e904 100644 --- a/lib/unistr/u8-uctomb.c +++ b/lib/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h index 8733079..13ed4cb 100644 --- a/lib/unitypes.in.h +++ b/lib/unitypes.in.h @@ -1,5 +1,5 @@ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -12,7 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNITYPES_H #define _UNITYPES_H diff --git a/lib/uniwidth.in.h b/lib/uniwidth.in.h index fc85e96..0cacc29 100644 --- a/lib/uniwidth.in.h +++ b/lib/uniwidth.in.h @@ -1,5 +1,5 @@ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2017 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _UNIWIDTH_H #define _UNIWIDTH_H diff --git a/lib/uniwidth/cjk.h b/lib/uniwidth/cjk.h index c354608..f7f822c 100644 --- a/lib/uniwidth/cjk.h +++ b/lib/uniwidth/cjk.h @@ -1,5 +1,5 @@ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include "streq.h" diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c index 0817d39..cd27d61 100644 --- a/lib/uniwidth/width.c +++ b/lib/uniwidth/width.c @@ -1,5 +1,5 @@ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -13,7 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -32,7 +32,7 @@ * - Zero width characters; generated from * "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt" */ -static const unsigned char nonspacing_table_data[36*64] = { +static const unsigned char nonspacing_table_data[38*64] = { /* 0x0000-0x01ff */ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ @@ -73,7 +73,7 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */ 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ - 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */ + 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */ 0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */ @@ -135,7 +135,7 @@ static const unsigned char nonspacing_table_data[36*64] = { /* 0x1800-0x19ff */ 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */ + 0x60, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */ 0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */ @@ -158,7 +158,7 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf0, /* 0x1dc0-0x1dff */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf8, /* 0x1dc0-0x1dff */ /* 0x2000-0x21ff */ 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */ 0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0x00, 0x00, /* 0x2040-0x207f */ @@ -199,7 +199,7 @@ static const unsigned char nonspacing_table_data[36*64] = { 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 */ - 0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */ + 0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */ 0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */ 0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */ @@ -268,7 +268,7 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, /* 0x11180-0x111bf */ 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */ /* 0x11200-0x113ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x00, /* 0x11200-0x1123f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x40, /* 0x11200-0x1123f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11240-0x1127f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11280-0x112bf */ 0x00, 0x00, 0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, /* 0x112c0-0x112ff */ @@ -277,8 +277,8 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11380-0x113bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */ /* 0x11400-0x115ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11400-0x1143f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11400-0x1143f */ + 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x85, /* 0x11480-0x114bf */ 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x114c0-0x114ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11500-0x1153f */ @@ -294,6 +294,15 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */ + /* 0x11c00-0x11dff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x3f, /* 0x11c00-0x11c3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c40-0x11c7f */ + 0x00, 0x00, 0xfc, 0xff, 0xff, 0xfc, 0x6d, 0x00, /* 0x11c80-0x11cbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11cc0-0x11cff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d00-0x11d3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d40-0x11d7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d80-0x11dbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11dc0-0x11dff */ /* 0x16a00-0x16bff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a00-0x16a3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a40-0x16a7f */ @@ -348,13 +357,22 @@ static const unsigned char nonspacing_table_data[36*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db40-0x1db7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db80-0x1dbbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dbc0-0x1dbff */ + /* 0x1e000-0x1e1ff */ + 0x7f, 0xff, 0xff, 0xf9, 0xdb, 0x07, 0x00, 0x00, /* 0x1e000-0x1e03f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e040-0x1e07f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e080-0x1e0bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e0c0-0x1e0ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e100-0x1e13f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e140-0x1e17f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e180-0x1e1bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e1c0-0x1e1ff */ /* 0x1e800-0x1e9ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e800-0x1e83f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e840-0x1e87f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e880-0x1e8bf */ 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e8c0-0x1e8ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e900-0x1e93f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */ + 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e980-0x1e9bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0x1e9c0-0x1e9ff */ }; @@ -376,20 +394,20 @@ static const signed char nonspacing_table_ind[248] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */ -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */ 22, 23, -1, -1, -1, 24, -1, -1, /* 0x10000-0x10fff */ - 25, 26, 27, 28, -1, -1, -1, -1, /* 0x11000-0x11fff */ + 25, 26, 27, 28, -1, -1, 29, -1, /* 0x11000-0x11fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */ - -1, -1, -1, -1, -1, 29, -1, 30, /* 0x16000-0x16fff */ + -1, -1, -1, -1, -1, 30, -1, 31, /* 0x16000-0x16fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */ - -1, -1, -1, -1, -1, -1, 31, -1, /* 0x1b000-0x1bfff */ + -1, -1, -1, -1, -1, -1, 32, -1, /* 0x1b000-0x1bfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */ - 32, 33, -1, -1, -1, 34, -1, -1, /* 0x1d000-0x1dfff */ - -1, -1, -1, -1, 35, -1, -1, -1 /* 0x1e000-0x1efff */ + 33, 34, -1, -1, -1, 35, -1, -1, /* 0x1d000-0x1dfff */ + 36, -1, -1, -1, 37, -1, -1, -1 /* 0x1e000-0x1efff */ }; /* Determine number of column positions required for UC. */ diff --git a/lib/unlink.c b/lib/unlink.c index 22427cb..ea1f525 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index aaf60a0..e3f0fcf 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Jim Meyering. */ diff --git a/lib/unused-parameter.h b/lib/unused-parameter.h new file mode 100644 index 0000000..40a0ff8 --- /dev/null +++ b/lib/unused-parameter.h @@ -0,0 +1,36 @@ +/* A C macro for declaring that specific function parameters are not used. + Copyright (C) 2008-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter + declarations for parameters that are not used. This helps to reduce + warnings, such as from GCC -Wunused-parameter. The syntax is as follows: + type param _GL_UNUSED_PARAMETER + or more generally + param_decl _GL_UNUSED_PARAMETER + For example: + int param _GL_UNUSED_PARAMETER + int *(*param)(void) _GL_UNUSED_PARAMETER + Other possible, but obscure and discouraged syntaxes: + int _GL_UNUSED_PARAMETER *(*param)(void) + _GL_UNUSED_PARAMETER int *(*param)(void) + */ +#ifndef _GL_UNUSED_PARAMETER +# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_UNUSED_PARAMETER __attribute__ ((__unused__)) +# else +# define _GL_UNUSED_PARAMETER +# endif +#endif diff --git a/lib/utime.c b/lib/utime.c new file mode 100644 index 0000000..80291d3 --- /dev/null +++ b/lib/utime.c @@ -0,0 +1,256 @@ +/* Work around platform bugs in utime. + Copyright (C) 2017-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible. */ + +#include + +/* Specification. */ +#include + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +# include +# include +# include +# include "filename.h" +# include "malloca.h" + +int +_gl_utimens_windows (const char *name, struct timespec ts[2]) +{ + /* POSIX + specifies: "More than two leading characters shall be treated as + a single character." */ + if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) + { + name += 2; + while (ISSLASH (name[1])) + name++; + } + + size_t len = strlen (name); + size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0); + + /* Remove trailing slashes (except the very first one, at position + drive_prefix_len), but remember their presence. */ + size_t rlen; + bool check_dir = false; + + rlen = len; + while (rlen > drive_prefix_len && ISSLASH (name[rlen-1])) + { + check_dir = true; + if (rlen == drive_prefix_len + 1) + break; + rlen--; + } + + const char *rname; + char *malloca_rname; + if (rlen == len) + { + rname = name; + malloca_rname = NULL; + } + else + { + malloca_rname = malloca (rlen + 1); + if (malloca_rname == NULL) + { + errno = ENOMEM; + return -1; + } + memcpy (malloca_rname, name, rlen); + malloca_rname[rlen] = '\0'; + rname = malloca_rname; + } + + DWORD error; + + /* Open a handle to the file. + CreateFile + + */ + HANDLE handle = + CreateFile (rname, + FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only + in case as different) makes sense only when applied to *all* + filesystem operations. */ + FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, + NULL); + if (handle == INVALID_HANDLE_VALUE) + { + error = GetLastError (); + goto failed; + } + + if (check_dir) + { + /* GetFileAttributes + */ + DWORD attributes = GetFileAttributes (rname); + if (attributes == INVALID_FILE_ATTRIBUTES) + { + error = GetLastError (); + CloseHandle (handle); + goto failed; + } + if ((attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) + { + CloseHandle (handle); + if (malloca_rname != NULL) + freea (malloca_rname); + errno = ENOTDIR; + return -1; + } + } + + { + /* Use SetFileTime(). See + + */ + FILETIME last_access_time; + FILETIME last_write_time; + if (ts == NULL) + { + /* GetSystemTimeAsFileTime is the same as + GetSystemTime followed by SystemTimeToFileTime. + . + It would be overkill to use + GetSystemTimePreciseAsFileTime + . */ + FILETIME current_time; + GetSystemTimeAsFileTime (¤t_time); + last_access_time = current_time; + last_write_time = current_time; + } + else + { + { + ULONGLONG time_since_16010101 = + (ULONGLONG) ts[0].tv_sec * 10000000 + ts[0].tv_nsec / 100 + 116444736000000000LL; + last_access_time.dwLowDateTime = (DWORD) time_since_16010101; + last_access_time.dwHighDateTime = time_since_16010101 >> 32; + } + { + ULONGLONG time_since_16010101 = + (ULONGLONG) ts[1].tv_sec * 10000000 + ts[1].tv_nsec / 100 + 116444736000000000LL; + last_write_time.dwLowDateTime = (DWORD) time_since_16010101; + last_write_time.dwHighDateTime = time_since_16010101 >> 32; + } + } + if (SetFileTime (handle, NULL, &last_access_time, &last_write_time)) + { + CloseHandle (handle); + if (malloca_rname != NULL) + freea (malloca_rname); + return 0; + } + else + { + #if 0 + DWORD sft_error = GetLastError (); + fprintf (stderr, "utimens SetFileTime error 0x%x\n", (unsigned int) sft_error); + #endif + CloseHandle (handle); + if (malloca_rname != NULL) + freea (malloca_rname); + errno = EINVAL; + return -1; + } + } + + failed: + { + #if 0 + fprintf (stderr, "utimens CreateFile/GetFileAttributes error 0x%x\n", (unsigned int) error); + #endif + if (malloca_rname != NULL) + freea (malloca_rname); + + switch (error) + { + /* Some of these errors probably cannot happen with the specific flags + that we pass to CreateFile. But who knows... */ + case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist. */ + case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist. */ + case ERROR_BAD_PATHNAME: /* rname is such as '\\server'. */ + case ERROR_BAD_NETPATH: /* rname is such as '\\nonexistentserver\share'. */ + case ERROR_BAD_NET_NAME: /* rname is such as '\\server\nonexistentshare'. */ + case ERROR_INVALID_NAME: /* rname contains wildcards, misplaced colon, etc. */ + case ERROR_DIRECTORY: + errno = ENOENT; + break; + + case ERROR_ACCESS_DENIED: /* rname is such as 'C:\System Volume Information\foo'. */ + case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys'. */ + errno = (ts != NULL ? EPERM : EACCES); + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_WRITE_PROTECT: + errno = EROFS; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + case ERROR_BUFFER_OVERFLOW: + case ERROR_FILENAME_EXCED_RANGE: + errno = ENAMETOOLONG; + break; + + case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ + errno = EPERM; + break; + + default: + errno = EINVAL; + break; + } + + return -1; + } +} + +int +utime (const char *name, const struct utimbuf *ts) +{ + if (ts == NULL) + return _gl_utimens_windows (name, NULL); + else + { + struct timespec ts_with_nanoseconds[2]; + ts_with_nanoseconds[0].tv_sec = ts->actime; + ts_with_nanoseconds[0].tv_nsec = 0; + ts_with_nanoseconds[1].tv_sec = ts->modtime; + ts_with_nanoseconds[1].tv_nsec = 0; + return _gl_utimens_windows (name, ts_with_nanoseconds); + } +} + +#endif diff --git a/lib/utime.in.h b/lib/utime.in.h new file mode 100644 index 0000000..8a52a0d --- /dev/null +++ b/lib/utime.in.h @@ -0,0 +1,88 @@ +/* Substitute for and wrapper around . + Copyright (C) 2017-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#ifndef _@GUARD_PREFIX@_UTIME_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_UTIME_H@ +# @INCLUDE_NEXT@ @NEXT_UTIME_H@ +#endif + +#ifndef _@GUARD_PREFIX@_UTIME_H +#define _@GUARD_PREFIX@_UTIME_H + +#if !@HAVE_UTIME_H@ +# include +#endif + +#if @GNULIB_UTIME@ +/* Get struct timespec. */ +# include +#endif + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +/* Define 'struct utimbuf' as an alias of 'struct _utimbuf' + (or possibly, if present, 'struct __utimbuf64'). */ +# define utimbuf _utimbuf + +#endif + + +#if @GNULIB_UTIME@ +# if @REPLACE_UTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define utime rpl_utime +# endif +_GL_FUNCDECL_RPL (utime, int, (const char *filename, const struct utimbuf *ts) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (utime, int, (const char *filename, const struct utimbuf *ts)); +# else +# if !@HAVE_UTIME@ +_GL_FUNCDECL_SYS (utime, int, (const char *filename, const struct utimbuf *ts) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (utime, int, (const char *filename, const struct utimbuf *ts)); +# endif +_GL_CXXALIASWARN (utime); +#elif defined GNULIB_POSIXCHECK +# undef utime +# if HAVE_RAW_DECL_UTIME +_GL_WARN_ON_USE (utime, + "utime is unportable - " + "use gnulib module canonicalize-lgpl for portability"); +# endif +#endif + +#if @GNULIB_UTIME@ +extern int _gl_utimens_windows (const char *filename, struct timespec ts[2]); +#endif + + +#endif /* _@GUARD_PREFIX@_UTIME_H */ +#endif /* _@GUARD_PREFIX@_UTIME_H */ diff --git a/lib/utimens.c b/lib/utimens.c index 3643668..c0b0704 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2003-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ @@ -30,22 +30,25 @@ #include #include #include +#include #include "stat-time.h" #include "timespec.h" -#if HAVE_UTIME_H -# include -#endif - -/* Some systems (even some that do have ) don't declare this - structure anywhere. */ -#ifndef HAVE_STRUCT_UTIMBUF -struct utimbuf -{ - long actime; - long modtime; -}; +/* On native Windows, use SetFileTime; but avoid this when compiling + GNU Emacs, which arranges for this in some other way and which + defines WIN32_LEAN_AND_MEAN itself. */ + +#if ((defined _WIN32 || defined __WIN32__) \ + && ! defined __CYGWIN__ && ! defined EMACS_CONFIGURATION) +# define USE_SETFILETIME +# define WIN32_LEAN_AND_MEAN +# include +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif #endif /* Avoid recursion with rpl_futimens or rpl_utimensat. */ @@ -193,7 +196,7 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) /* Some Linux-based NFS clients are buggy, and mishandle timestamps of files in NFS file systems in some cases. We have no configure-time test for this, but please see - for references to + for references to some of the problems with Linux 2.6.16. If this affects you, compile with -DHAVE_BUGGY_NFS_TIME_STAMPS; this is reported to help in some cases, albeit at a cost in performance. But you @@ -247,8 +250,8 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) result = utimensat (AT_FDCWD, file, ts, 0); # ifdef __linux__ /* Work around a kernel bug: - http://bugzilla.redhat.com/442352 - http://bugzilla.redhat.com/449910 + https://bugzilla.redhat.com/show_bug.cgi?id=442352 + https://bugzilla.redhat.com/show_bug.cgi?id=449910 It appears that utimensat can mistakenly return 280 rather than -1 upon ENOSYS failure. FIXME: remove in 2010 or whenever the offending kernels @@ -284,6 +287,90 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) lutimensat_works_really = -1; #endif /* HAVE_UTIMENSAT || HAVE_FUTIMENS */ +#ifdef USE_SETFILETIME + /* On native Windows, use SetFileTime(). See + + */ + if (0 <= fd) + { + HANDLE handle; + FILETIME current_time; + FILETIME last_access_time; + FILETIME last_write_time; + + handle = (HANDLE) _get_osfhandle (fd); + if (handle == INVALID_HANDLE_VALUE) + { + errno = EBADF; + return -1; + } + + if (ts == NULL || ts[0].tv_nsec == UTIME_NOW || ts[1].tv_nsec == UTIME_NOW) + { + /* GetSystemTimeAsFileTime + . + It would be overkill to use + GetSystemTimePreciseAsFileTime + . */ + GetSystemTimeAsFileTime (¤t_time); + } + + if (ts == NULL || ts[0].tv_nsec == UTIME_NOW) + { + last_access_time = current_time; + } + else if (ts[0].tv_nsec == UTIME_OMIT) + { + last_access_time.dwLowDateTime = 0; + last_access_time.dwHighDateTime = 0; + } + else + { + ULONGLONG time_since_16010101 = + (ULONGLONG) ts[0].tv_sec * 10000000 + ts[0].tv_nsec / 100 + 116444736000000000LL; + last_access_time.dwLowDateTime = (DWORD) time_since_16010101; + last_access_time.dwHighDateTime = time_since_16010101 >> 32; + } + + if (ts == NULL || ts[1].tv_nsec == UTIME_NOW) + { + last_write_time = current_time; + } + else if (ts[1].tv_nsec == UTIME_OMIT) + { + last_write_time.dwLowDateTime = 0; + last_write_time.dwHighDateTime = 0; + } + else + { + ULONGLONG time_since_16010101 = + (ULONGLONG) ts[1].tv_sec * 10000000 + ts[1].tv_nsec / 100 + 116444736000000000LL; + last_write_time.dwLowDateTime = (DWORD) time_since_16010101; + last_write_time.dwHighDateTime = time_since_16010101 >> 32; + } + + if (SetFileTime (handle, NULL, &last_access_time, &last_write_time)) + return 0; + else + { + DWORD sft_error = GetLastError (); + #if 0 + fprintf (stderr, "fdutimens SetFileTime error 0x%x\n", (unsigned int) sft_error); + #endif + switch (sft_error) + { + case ERROR_ACCESS_DENIED: /* fd was opened without O_RDWR */ + errno = EACCES; /* not specified by POSIX */ + break; + default: + errno = EINVAL; + break; + } + return -1; + } + } +#endif + /* The platform lacks an interface to set file timestamps with nanosecond resolution, so do the best we can, discarding any fractional part of the timestamp. */ @@ -390,7 +477,9 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) return -1; } -#if HAVE_WORKING_UTIMES +#ifdef USE_SETFILETIME + return _gl_utimens_windows (file, ts); +#elif HAVE_WORKING_UTIMES return utimes (file, t); #else { @@ -477,8 +566,8 @@ lutimens (char const *file, struct timespec const timespec[2]) result = utimensat (AT_FDCWD, file, ts, AT_SYMLINK_NOFOLLOW); # ifdef __linux__ /* Work around a kernel bug: - http://bugzilla.redhat.com/442352 - http://bugzilla.redhat.com/449910 + https://bugzilla.redhat.com/show_bug.cgi?id=442352 + https://bugzilla.redhat.com/show_bug.cgi?id=449910 It appears that utimensat can mistakenly return 280 rather than -1 upon ENOSYS failure. FIXME: remove in 2010 or whenever the offending kernels diff --git a/lib/utimens.h b/lib/utimens.h index 4d9c18e..a24e62c 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright 2012-2017 Free Software Foundation, Inc. + Copyright 2012-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index d654689..8b91e3f 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ /* This file can be parametrized with the following macros: VASNPRINTF The name of the function being defined. @@ -118,6 +118,14 @@ # include "fpucw.h" #endif +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* Default parameters. */ #ifndef VASNPRINTF # if WIDE_CHAR_VERSION @@ -156,6 +164,7 @@ # define SNPRINTF snwprintf # else # define SNPRINTF _snwprintf +# define USE_MSVC__SNPRINTF 1 # endif # else /* Unix. */ @@ -181,7 +190,9 @@ /* Here we need to call the native snprintf, not rpl_snprintf. */ # undef snprintf # else + /* MSVC versions < 14 did not have snprintf, only _snprintf. */ # define SNPRINTF _snprintf +# define USE_MSVC__SNPRINTF 1 # endif # else /* Unix. */ @@ -208,7 +219,7 @@ #undef remainder #define remainder rem -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && !WIDE_CHAR_VERSION +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && !WIDE_CHAR_VERSION # if (HAVE_STRNLEN && !defined _AIX) # define local_strnlen strnlen # else @@ -224,7 +235,7 @@ local_strnlen (const char *string, size_t maxlen) # endif #endif -#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T +#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T # if HAVE_WCSLEN # define local_wcslen wcslen # else @@ -247,7 +258,7 @@ local_wcslen (const wchar_t *s) # endif #endif -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && HAVE_WCHAR_T && WIDE_CHAR_VERSION +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION # if HAVE_WCSNLEN # define local_wcsnlen wcsnlen # else @@ -1517,7 +1528,7 @@ is_borderline (const char *digits, size_t precision) #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* Use a different function name, to make it possible that the 'wchar_t' parametrization and the 'char' parametrization get compiled in the same @@ -2392,7 +2403,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } } #endif -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T else if (dp->conversion == 's' # if WIDE_CHAR_VERSION && a.arg[dp->arg_index].type != TYPE_WIDE_STRING @@ -4591,10 +4602,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION int has_precision; size_t precision; #endif @@ -4623,7 +4634,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION width = 0; if (dp->width_start != dp->width_end) { @@ -4657,7 +4668,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION has_precision = 0; precision = 6; if (dp->precision_start != dp->precision_end) @@ -4834,7 +4845,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, *fbp++ = 'l'; # endif #endif - /*FALLTHROUGH*/ + FALLTHROUGH; case TYPE_LONGINT: case TYPE_ULONGINT: #if HAVE_WINT_T @@ -4858,7 +4869,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif *fbp = dp->conversion; #if USE_SNPRINTF -# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) +# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ + && !defined __UCLIBC__) \ + || (defined __APPLE__ && defined __MACH__) \ + || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) fbp[1] = '%'; fbp[2] = 'n'; fbp[3] = '\0'; @@ -4872,6 +4886,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, in format strings in writable memory may crash the program (if compiled with _FORTIFY_SOURCE=2), so we should avoid it in this situation. */ + /* On Mac OS X 10.3 or newer, we know that snprintf's return + value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 + and gl_SNPRINTF_TRUNCATION_C99 pass. + Therefore we can avoid using %n in this situation. + On Mac OS X 10.13 or newer, the use of %n in format strings + in writable memory by default crashes the program, so we + should avoid it in this situation. */ /* On native Windows systems (such as mingw), we can avoid using %n because: - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, @@ -4884,8 +4905,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, On native Windows systems (such as mingw) where the OS is Windows Vista, the use of %n in format strings by default crashes the program. See - and - + and + So we should avoid %n in this situation. */ fbp[1] = '\0'; # endif @@ -5127,7 +5148,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Look at the snprintf() return value. */ if (retcount < 0) { -# if !HAVE_SNPRINTF_RETVAL_C99 +# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* HP-UX 10.20 snprintf() is doubly deficient: It doesn't understand the '%n' directive, *and* it returns -1 (rather than the length diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index c227825..3eaaa7e 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifndef _VASNPRINTF_H #define _VASNPRINTF_H diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 2dd6e3f..aacb306 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #include diff --git a/lib/verify.h b/lib/verify.h index dcba9c8..bc7f99d 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c index 6a19f4c..e11ab6c 100644 --- a/lib/vsnprintf.c +++ b/lib/vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2018 Free Software Foundation, Inc. Written by Simon Josefsson and Yoann Vandoorselaere . This program is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, see . */ + with this program; if not, see . */ #ifdef HAVE_CONFIG_H # include diff --git a/lib/w32sock.h b/lib/w32sock.h index 8ac8ab7..1e5e584 100644 --- a/lib/w32sock.h +++ b/lib/w32sock.h @@ -1,6 +1,6 @@ /* w32sock.h --- internal auxiliary functions for Windows socket functions - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paolo Bonzini */ @@ -26,7 +26,11 @@ #include /* Get _get_osfhandle(). */ -#include "msvc-nothrow.h" +#if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +#else +# include +#endif #define FD_TO_SOCKET(fd) ((SOCKET) _get_osfhandle ((fd))) #define SOCKET_TO_FD(fh) (_open_osfhandle ((intptr_t) (fh), O_RDWR | O_BINARY)) diff --git a/lib/w32spawn.h b/lib/w32spawn.h index 7932662..3f675eb 100644 --- a/lib/w32spawn.h +++ b/lib/w32spawn.h @@ -1,5 +1,5 @@ /* Auxiliary functions for the creation of subprocesses. Native Windows API. - Copyright (C) 2001, 2003-2017 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef __KLIBC__ /* Get declarations of the native Windows API functions. */ @@ -30,7 +30,11 @@ #include /* Get _get_osfhandle(). */ -#include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif #include "cloexec.h" #include "xalloc.h" diff --git a/lib/wait-process.c b/lib/wait-process.c index 62b10da..1926bf5 100644 --- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -39,14 +39,14 @@ #define SIZEOF(a) (sizeof(a) / sizeof(a[0])) -#if defined _MSC_VER || defined __MINGW32__ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -#define WIN32_LEAN_AND_MEAN -#include +# define WIN32_LEAN_AND_MEAN +# include /* The return value of spawnvp() is really a process handle as returned by CreateProcess(). Therefore we can kill it using TerminateProcess. */ -#define kill(pid,sig) TerminateProcess ((HANDLE) (pid), sig) +# define kill(pid,sig) TerminateProcess ((HANDLE) (pid), sig) #endif diff --git a/lib/wait-process.h b/lib/wait-process.h index 2e99757..0e73e71 100644 --- a/lib/wait-process.h +++ b/lib/wait-process.h @@ -1,5 +1,5 @@ /* Waiting for a subprocess to finish. - Copyright (C) 2001-2003, 2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef _WAIT_PROCESS_H #define _WAIT_PROCESS_H diff --git a/lib/waitpid.c b/lib/waitpid.c index 412529f..b2e346a 100644 --- a/lib/waitpid.c +++ b/lib/waitpid.c @@ -1,5 +1,5 @@ /* Wait for process state change. - Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #include diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h new file mode 100644 index 0000000..e76c384 --- /dev/null +++ b/lib/warn-on-use.h @@ -0,0 +1,109 @@ +/* A C macro for emitting warnings if a function is used. + Copyright (C) 2010-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* _GL_WARN_ON_USE (function, "literal string") issues a declaration + for FUNCTION which will then trigger a compiler warning containing + the text of "literal string" anywhere that function is called, if + supported by the compiler. If the compiler does not support this + feature, the macro expands to an unused extern declaration. + + This macro is useful for marking a function as a potential + portability trap, with the intent that "literal string" include + instructions on the replacement function that should be used + instead. However, one of the reasons that a function is a + portability trap is if it has the wrong signature. Declaring + FUNCTION with a different signature in C is a compilation error, so + this macro must use the same type as any existing declaration so + that programs that avoid the problematic FUNCTION do not fail to + compile merely because they included a header that poisoned the + function. But this implies that _GL_WARN_ON_USE is only safe to + use if FUNCTION is known to already have a declaration. Use of + this macro implies that there must not be any other macro hiding + the declaration of FUNCTION; but undefining FUNCTION first is part + of the poisoning process anyway (although for symbols that are + provided only via a macro, the result is a compilation error rather + than a warning containing "literal string"). Also note that in + C++, it is only safe to use if FUNCTION has no overloads. + + For an example, it is possible to poison 'getline' by: + - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], + [getline]) in configure.ac, which potentially defines + HAVE_RAW_DECL_GETLINE + - adding this code to a header that wraps the system : + #undef getline + #if HAVE_RAW_DECL_GETLINE + _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" + "not universally present; use the gnulib module getline"); + #endif + + It is not possible to directly poison global variables. But it is + possible to write a wrapper accessor function, and poison that + (less common usage, like &environ, will cause a compilation error + rather than issue the nice warning, but the end result of informing + the developer about their portability problem is still achieved): + #if HAVE_RAW_DECL_ENVIRON + static char ***rpl_environ (void) { return &environ; } + _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); + # undef environ + # define environ (*rpl_environ ()) + #endif + */ +#ifndef _GL_WARN_ON_USE + +# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +/* A compiler attribute is available in gcc versions 4.3.0 and later. */ +# define _GL_WARN_ON_USE(function, message) \ +extern __typeof__ (function) function __attribute__ ((__warning__ (message))) +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +/* Verify the existence of the function. */ +# define _GL_WARN_ON_USE(function, message) \ +extern __typeof__ (function) function +# else /* Unsupported. */ +# define _GL_WARN_ON_USE(function, message) \ +_GL_WARN_EXTERN_C int _gl_warn_on_use +# endif +#endif + +/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") + is like _GL_WARN_ON_USE (function, "string"), except that the function is + declared with the given prototype, consisting of return type, parameters, + and attributes. + This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does + not work in this case. */ +#ifndef _GL_WARN_ON_USE_CXX +# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +extern rettype function parameters_and_attributes \ + __attribute__ ((__warning__ (msg))) +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +/* Verify the existence of the function. */ +# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +extern rettype function parameters_and_attributes +# else /* Unsupported. */ +# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +_GL_WARN_EXTERN_C int _gl_warn_on_use +# endif +#endif + +/* _GL_WARN_EXTERN_C declaration; + performs the declaration with C linkage. */ +#ifndef _GL_WARN_EXTERN_C +# if defined __cplusplus +# define _GL_WARN_EXTERN_C extern "C" +# else +# define _GL_WARN_EXTERN_C extern +# endif +#endif diff --git a/lib/wchar.in.h b/lib/wchar.in.h index c8f99f5..51a5dda 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2017 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Eric Blake. */ @@ -31,7 +31,7 @@ @PRAGMA_COLUMNS@ #if (((defined __need_mbstate_t || defined __need_wint_t) \ - && !defined __MINGW32__ && !defined __KLIBC__) \ + && !defined __MINGW32__) \ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ @@ -113,12 +113,16 @@ # define WEOF -1 # endif #else -/* mingw and MSVC define wint_t as 'unsigned short' in . - This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be - "unchanged by default argument promotions". Override it. */ +/* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ # if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t -# include +# if @HAVE_CRTDEFS_H@ +# include +# else +# include +# endif typedef unsigned int rpl_wint_t; # undef wint_t # define wint_t rpl_wint_t @@ -448,11 +452,6 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); -# elif defined __KLIBC__ -/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a - static inline function. The implementation of wcwidth in wcwidth.c - causes a "conflicting types" error. */ -# undef wcwidth # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif @@ -1036,6 +1035,38 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " #endif +/* Convert *TP to a date and time wide string. See + . */ +#if @GNULIB_WCSFTIME@ +# if @REPLACE_WCSFTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsftime +# define wcsftime rpl_wcsftime +# endif +_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, + const wchar_t *__fmt, const struct tm *__tp) + _GL_ARG_NONNULL ((1, 3, 4))); +_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, + const wchar_t *__fmt, const struct tm *__tp)); +# else +# if !@HAVE_WCSFTIME@ +_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, + const wchar_t *__fmt, const struct tm *__tp) + _GL_ARG_NONNULL ((1, 3, 4))); +# endif +_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, + const wchar_t *__fmt, const struct tm *__tp)); +# endif +_GL_CXXALIASWARN (wcsftime); +#elif defined GNULIB_POSIXCHECK +# undef wcsftime +# if HAVE_RAW_DECL_WCSFTIME +_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " + "use gnulib module wcsftime for portability"); +# endif +#endif + + #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index f956ecf..8f01972 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/wctype.in.h b/lib/wctype.in.h index d106cf2..1092016 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ /* Written by Bruno Haible and Paul Eggert. */ @@ -56,11 +56,13 @@ # include #endif -/* mingw has declarations of towupper and towlower in as - well . Include in advance to avoid rpl_ prefix - being added to the declarations. */ -#ifdef __MINGW32__ +/* Native Windows (mingw, MSVC) have declarations of towupper, towlower, and + isw* functions in , as well as in . Include + , in advance to avoid rpl_ prefix being added to the + declarations. */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # include +# include #endif /* Include the original if it exists. @@ -105,12 +107,16 @@ _GL_INLINE_HEADER_BEGIN # define WEOF -1 # endif #else -/* mingw and MSVC define wint_t as 'unsigned short' in . - This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be - "unchanged by default argument promotions". Override it. */ +/* mingw and MSVC define wint_t as 'unsigned short' in or + . This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ # if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t -# include +# if @HAVE_CRTDEFS_H@ +# include +# else +# include +# endif typedef unsigned int rpl_wint_t; # undef wint_t # define wint_t rpl_wint_t diff --git a/lib/wcwidth.c b/lib/wcwidth.c index 038e865..5fb090e 100644 --- a/lib/wcwidth.c +++ b/lib/wcwidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/write.c b/lib/write.c index 6a3b623..92b36ad 100644 --- a/lib/write.c +++ b/lib/write.c @@ -1,5 +1,5 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include @@ -34,8 +34,14 @@ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include -# include "msvc-inval.h" -# include "msvc-nothrow.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif # undef write diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 3a64aa5..bfe6109 100644 --- a/lib/xalloc-die.c +++ b/lib/xalloc-die.c @@ -1,6 +1,6 @@ /* Report a memory allocation failure and exit. - Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2017 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index ff0efc6..3426e10 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef XALLOC_OVERSIZED_H_ #define XALLOC_OVERSIZED_H_ @@ -44,7 +44,7 @@ typedef size_t __xalloc_count_type; #if 7 <= __GNUC__ # define xalloc_oversized(n, s) \ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) -#elif 5 <= __GNUC__ && !__STRICT_ANSI__ +#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ diff --git a/lib/xalloc.h b/lib/xalloc.h index 484b67f..2a51b84 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -1,6 +1,6 @@ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef XALLOC_H_ #define XALLOC_H_ @@ -194,6 +194,8 @@ x2nrealloc (void *p, size_t *pn, size_t s) n = DEFAULT_MXFAST / s; n += !n; } + if (xalloc_oversized (n, s)) + xalloc_die (); } else { diff --git a/lib/xmalloc.c b/lib/xmalloc.c index a4d308d..9a30d67 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,6 +1,6 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/xmemdup0.c b/lib/xmemdup0.c index f198be4..1b53d11 100644 --- a/lib/xmemdup0.c +++ b/lib/xmemdup0.c @@ -1,6 +1,6 @@ /* xmemdup0.c -- copy a block of arbitrary bytes, plus a trailing NUL - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/xmemdup0.h b/lib/xmemdup0.h index ed4b980..d182028 100644 --- a/lib/xmemdup0.h +++ b/lib/xmemdup0.h @@ -1,6 +1,6 @@ /* xmemdup0.h -- copy a block of arbitrary bytes, plus a trailing NUL - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #ifndef XMEMDUP_H_ # define XMEMDUP_H_ diff --git a/lib/xsize.h b/lib/xsize.h index daf78d6..8aeb3b7 100644 --- a/lib/xsize.h +++ b/lib/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, see . */ + along with this program; if not, see . */ #ifndef _XSIZE_H #define _XSIZE_H diff --git a/lib/xstrndup.c b/lib/xstrndup.c index 8fbef7f..3b1700a 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/lib/xstrndup.h b/lib/xstrndup.h index d901c2c..0a4420d 100644 --- a/lib/xstrndup.h +++ b/lib/xstrndup.h @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ #include diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index bb3512f..bd24796 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 3 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index c73adc8..4e67e5f 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 16 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 7f0604c..b9d94e8 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 14 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -44,12 +44,12 @@ AC_DEFUN([gl_FUNC_ALLOCA], AC_DEFUN([gl_PREREQ_ALLOCA], [:]) # This works around a bug in autoconf <= 2.68. -# See . +# See . m4_version_prereq([2.69], [] ,[ # This is taken from the following Autoconf patch: -# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=6cd9f12520b0d6f76d3230d7565feba1ecf29497 +# https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=6cd9f12520b0d6f76d3230d7565feba1ecf29497 # _AC_LIBOBJ_ALLOCA # ----------------- diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index d655455..e73dc69 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ # arpa_inet_h.m4 serial 13 -dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/asm-underscore.m4 b/m4/asm-underscore.m4 index 07270c9..cc92534 100644 --- a/m4/asm-underscore.m4 +++ b/m4/asm-underscore.m4 @@ -1,5 +1,5 @@ # asm-underscore.m4 serial 3 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/base32.m4 b/m4/base32.m4 index e9807f3..9154d40 100644 --- a/m4/base32.m4 +++ b/m4/base32.m4 @@ -1,5 +1,5 @@ # base32.m4 serial 4 -dnl Copyright (C) 2004, 2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 1021809..8acdffc 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ -# btowc.m4 serial 10 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# btowc.m4 serial 11 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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_BTOWC], dnl Check whether is usable at all, first. Otherwise the test dnl program below may lead to an endless loop. See - dnl . + dnl . AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) AC_CHECK_FUNCS_ONCE([btowc]) @@ -50,6 +50,8 @@ changequote(,)dnl case "$host_os" in # Guess no on Cygwin. cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_nul="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_btowc_nul="guessing yes" ;; esac @@ -65,10 +67,12 @@ changequote([,])dnl 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" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none; then diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index aa3364b..a1eaf96 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -1,6 +1,6 @@ dnl Check for __builtin_expect. -dnl Copyright 2016-2017 Free Software Foundation, Inc. +dnl Copyright 2016-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 21b6f25..47791f9 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ # clock_time.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close.m4 b/m4/close.m4 index 005a43a..f11b17e 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ -# close.m4 serial 8 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# close.m4 serial 9 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,10 +7,12 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_CLOSE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_CLOSE=1 - fi + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_CLOSE=1 + fi + ]) m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [ gl_PREREQ_SYS_H_WINSOCK2 if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then diff --git a/m4/configmake.m4 b/m4/configmake.m4 index b783296..e0b5835 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ # configmake.m4 serial 2 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 46f5394..820b047 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ #serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index c80f9ea..e99d4a3 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index bdb9ae2..c785d37 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ #serial 25 -dnl Copyright (C) 2002, 2005, 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 96b9bca..a5a4e26 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index 3b9fa5f..68b67ea 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 9f0f2f2..9dbdedd 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 12 -dnl Copyright (C) 2004, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index 57c6f12..280fdce 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/exponentd.m4 b/m4/exponentd.m4 index cd64b92..7b02a4c 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index c60f537..d1b2321 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 15 -*- Autoconf -*- +# serial 17 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,6 +68,14 @@ dnl configure.ac when using autoheader 2.62. #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Enable NetBSD extensions on NetBSD. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD extensions on NetBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS @@ -128,6 +136,8 @@ dnl configure.ac when using autoheader 2.62. AC_DEFINE([_ALL_SOURCE]) AC_DEFINE([_DARWIN_C_SOURCE]) AC_DEFINE([_GNU_SOURCE]) + AC_DEFINE([_NETBSD_SOURCE]) + AC_DEFINE([_OPENBSD_SOURCE]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 00f9609..da8a2cc 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2017 Free Software Foundation, Inc. +dnl Copyright 2012-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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_EXTERN_INLINE], [/* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see - . + . Suppress extern inline with Sun C in standards-conformance mode, as it mishandles inline functions that call each other. E.g., for 'inline void f @@ -28,16 +28,16 @@ AC_DEFUN([gl_EXTERN_INLINE], from calling static functions. This bug is known to occur on: OS X 10.8 and earlier; see: - http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log FreeBSD; see: - http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . + for clang but remains for g++; see . Assume DragonFly and FreeBSD will be similar. */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4 index 94eae24..ca39d45 100644 --- a/m4/fatal-signal.m4 +++ b/m4/fatal-signal.m4 @@ -1,5 +1,5 @@ # fatal-signal.m4 serial 9 -dnl Copyright (C) 2003-2004, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 3c3b63c..4dc3daa 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ -# fcntl-o.m4 serial 4 -dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. +# fcntl-o.m4 serial 5 +dnl Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,6 +18,7 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], [AC_REQUIRE([AC_GNU_SOURCE])]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_FUNCS_ONCE([symlink]) AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], @@ -116,7 +117,13 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac], - [gl_cv_header_working_fcntl_h=cross-compiling])]) + [case "$host_os" in + # Guess 'no' on native Windows. + mingw*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; + esac + ]) + ]) case $gl_cv_header_working_fcntl_h in #( *O_NOATIME* | no | cross-compiling) ac_val=0;; #( diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index dda3b5f..46b2445 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 9 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 09c21ef..9fd3ab1 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ # serial 15 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 35580ac..db93cf3 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ -# serial 4 +# serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2018 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. @@ -17,12 +17,15 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER], [[#include #include #include - struct s { int n; double d[]; };]], + struct m { struct m *next, **list; char name[]; }; + struct s { struct s *p; struct m *m; int n; double d[]; };]], [[int m = getchar (); size_t nbytes = offsetof (struct s, d) + m * sizeof (double); nbytes += sizeof (struct s) - 1; nbytes -= nbytes % sizeof (struct s); struct s *p = malloc (nbytes); + p->p = p; + p->m = NULL; p->d[0] = 0.0; return p->d != (double *) NULL;]])], [ac_cv_c_flexmember=yes], diff --git a/m4/float_h.m4 b/m4/float_h.m4 index e8522ab..02beb85 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,5 +1,5 @@ -# float_h.m4 serial 9 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +# float_h.m4 serial 12 +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,7 +14,7 @@ AC_DEFUN([gl_FLOAT_H], aix* | beos* | openbsd* | mirbsd* | irix*) FLOAT_H=float.h ;; - freebsd*) + freebsd* | dragonfly*) case "$host_cpu" in changequote(,)dnl i[34567]86 ) @@ -24,10 +24,14 @@ changequote([,])dnl x86_64 ) # On x86_64 systems, the C compiler may still be generating # 32-bit code. - AC_EGREP_CPP([yes], - [#if defined __LP64__ || defined __x86_64__ || defined __amd64__ - yes - #endif], + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __x86_64__ || defined __amd64__ + int ok; + #else + error fail + #endif + ]])], [], [FLOAT_H=float.h]) ;; @@ -42,7 +46,7 @@ changequote([,])dnl ;; esac case "$host_os" in - aix* | freebsd* | linux*) + aix* | freebsd* | dragonfly* | linux*) if test -n "$FLOAT_H"; then REPLACE_FLOAT_LDBL=1 fi @@ -69,14 +73,20 @@ int main () [gl_cv_func_itold_works=no], [case "$host" in sparc*-*-linux*) - AC_EGREP_CPP([yes], - [#if defined __LP64__ || defined __arch64__ - yes - #endif], + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __arch64__ + int ok; + #else + error fail + #endif + ]])], [gl_cv_func_itold_works="guessing no"], [gl_cv_func_itold_works="guessing yes"]) ;; - *) gl_cv_func_itold_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_itold_works="guessing yes" ;; + *) gl_cv_func_itold_works="guessing yes" ;; esac ]) ]) diff --git a/m4/flock.m4 b/m4/flock.m4 index 5b3544d..0e47d1d 100644 --- a/m4/flock.m4 +++ b/m4/flock.m4 @@ -1,5 +1,5 @@ # flock.m4 serial 3 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 7292c1a..d355947 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ # Check for fnmatch - serial 9. -*- coding: utf-8 -*- -# Copyright (C) 2000-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fopen.m4 b/m4/fopen.m4 index 0d09e4e..2be602c 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,5 +1,5 @@ -# fopen.m4 serial 9 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# fopen.m4 serial 10 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,7 +27,11 @@ AC_DEFUN([gl_FUNC_FOPEN], #include int main () { - return fopen ("conftest.sl/", "w") != NULL; + FILE *fp = fopen ("conftest.sl/", "w"); + int result = (fp != NULL); + if (fp != NULL) + fclose (fp); + return result; }]])], [gl_cv_func_fopen_slash=yes], [gl_cv_func_fopen_slash=no], diff --git a/m4/fseek.m4 b/m4/fseek.m4 index 4664ac1..4a9ac7e 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,5 +1,5 @@ # fseek.m4 serial 4 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index fdb565b..8967cf1 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ -# fseeko.m4 serial 17 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# fseeko.m4 serial 18 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -37,9 +37,10 @@ AC_DEFUN([gl_FUNC_FSEEKO], fi m4_ifdef([gl_FUNC_FFLUSH_STDIN], [ gl_FUNC_FFLUSH_STDIN - if test $gl_cv_func_fflush_stdin != yes; then - REPLACE_FSEEKO=1 - fi + case "$gl_cv_func_fflush_stdin" in + *yes) ;; + *) REPLACE_FSEEKO=1 ;; + esac ]) fi ]) diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 14c871a..f7fc383 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,22 +1,22 @@ -# fstat.m4 serial 4 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +# fstat.m4 serial 6 +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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_FSTAT], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FSTAT=1 - fi - - AC_REQUIRE([gl_HEADER_SYS_STAT_H]) - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - REPLACE_FSTAT=1 - fi + case "$host_os" in + mingw* | solaris*) + dnl On MinGW, the original stat() returns st_atime, st_mtime, + dnl st_ctime values that are affected by the time zone. + dnl Solaris stat can return a negative tv_nsec. + REPLACE_FSTAT=1 + ;; + esac dnl Replace fstat() for supporting the gnulib-defined open() on directories. m4_ifdef([gl_FUNC_FCHDIR], [ @@ -32,5 +32,8 @@ AC_DEFUN([gl_FUNC_FSTAT], ]) ]) -# Prerequisites of lib/fstat.c. -AC_DEFUN([gl_PREREQ_FSTAT], [:]) +# Prerequisites of lib/fstat.c and lib/stat-w32.c. +AC_DEFUN([gl_PREREQ_FSTAT], [ + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + : +]) diff --git a/m4/ftell.m4 b/m4/ftell.m4 index b8336ce..0ae8a92 100644 --- a/m4/ftell.m4 +++ b/m4/ftell.m4 @@ -1,5 +1,5 @@ # ftell.m4 serial 3 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ftello.m4 b/m4/ftello.m4 index 0867c2a..b8fc70d 100644 --- a/m4/ftello.m4 +++ b/m4/ftello.m4 @@ -1,5 +1,5 @@ -# ftello.m4 serial 11 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# ftello.m4 serial 13 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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 @@ changequote(,)dnl case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_func_ftello_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_ftello_works="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_ftello_works="guessing yes" ;; esac @@ -73,7 +75,7 @@ main (void) if (fp == NULL) return 70; if (fwrite ("foogarsh", 1, 8, fp) < 8) - return 71; + { fclose (fp); return 71; } if (fclose (fp)) return 72; @@ -84,19 +86,19 @@ main (void) if (fp == NULL) return 73; if (fseek (fp, -1, SEEK_END)) - return 74; + { fclose (fp); return 74; } if (!(getc (fp) == 'h')) - return 1; + { fclose (fp); return 1; } if (!(getc (fp) == EOF)) - return 2; + { fclose (fp); return 2; } if (!(ftell (fp) == 8)) - return 3; + { fclose (fp); return 3; } if (!(ftell (fp) == 8)) - return 4; + { fclose (fp); return 4; } if (!(putc ('!', fp) == '!')) - return 5; + { fclose (fp); return 5; } if (!(ftell (fp) == 9)) - return 6; + { fclose (fp); return 6; } if (!(fclose (fp) == 0)) return 7; fp = fopen (TESTFILE, "r"); @@ -105,9 +107,9 @@ main (void) { char buf[10]; if (!(fread (buf, 1, 10, fp) == 9)) - return 10; + { fclose (fp); return 10; } if (!(memcmp (buf, "foogarsh!", 9) == 0)) - return 11; + { fclose (fp); return 11; } } if (!(fclose (fp) == 0)) return 12; diff --git a/m4/futimens.m4 b/m4/futimens.m4 index 12bed98..c2ae9d8 100644 --- a/m4/futimens.m4 +++ b/m4/futimens.m4 @@ -1,7 +1,7 @@ # serial 7 # See if we need to provide futimens replacement. -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -23,10 +23,14 @@ AC_DEFUN([gl_FUNC_FUTIMENS], #include #include #include -]], [[struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; +]], [[struct timespec ts[2]; int fd = creat ("conftest.file", 0600); struct stat st; if (fd < 0) return 1; + ts[0].tv_sec = 1; + ts[0].tv_nsec = UTIME_OMIT; + ts[1].tv_sec = 1; + ts[1].tv_nsec = UTIME_NOW; errno = 0; if (futimens (AT_FDCWD, NULL) == 0) return 2; if (errno != EBADF) return 3; diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index f5e2284..53e6c34 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,5 +1,5 @@ # getaddrinfo.m4 serial 31 -dnl Copyright (C) 2004-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index 24adb94..e50af81 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ -# getdelim.m4 serial 11 +# getdelim.m4 serial 12 -dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2018 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, @@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_GETDELIM], size_t siz = 0; int len = getdelim (&line, &siz, '\n', in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 2; + { free (line); fclose (in); return 2; } } { /* Test result for a NULL buffer and a non-zero size. @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_GETDELIM], char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getdelim (&line, &siz, '\n', in) == -1) - return 3; + { fclose (in); return 3; } free (line); } fclose (in); diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 1af2a24..4cc1a8f 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ -# getdtablesize.m4 serial 6 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# getdtablesize.m4 serial 7 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,29 +12,43 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], AC_CHECK_DECLS_ONCE([getdtablesize]) if test $ac_cv_func_getdtablesize = yes && test $ac_cv_have_decl_getdtablesize = yes; then - # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit - # up to an unchangeable hard limit; all other platforms correctly - # require setrlimit before getdtablesize() can report a larger value. AC_CACHE_CHECK([whether getdtablesize works], [gl_cv_func_getdtablesize_works], - [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[#include ]], - [int size = getdtablesize(); - if (dup2 (0, getdtablesize()) != -1) - return 1; - if (size != getdtablesize()) - return 2; - ])], - [gl_cv_func_getdtablesize_works=yes], - [gl_cv_func_getdtablesize_works=no], - [case "$host_os" in - cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows - gl_cv_func_getdtablesize_works="guessing no" ;; - *) gl_cv_func_getdtablesize_works="guessing yes" ;; - esac]) + [dnl There are two concepts: the "maximum possible file descriptor value + 1" + dnl and the "maximum number of open file descriptors in a process". + dnl Per SUSv2 and POSIX, getdtablesize() should return the first one. + dnl On most platforms, the first and the second concept are the same. + dnl On OpenVMS, however, they are different and getdtablesize() returns + dnl the second one; thus the test below fails. But we don't care + dnl because there's no good way to write a replacement getdtablesize(). + case "$host_os" in + vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; + *) + dnl Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft + dnl limit up to an unchangeable hard limit; all other platforms + dnl correctly require setrlimit before getdtablesize() can report + dnl a larger value. + AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[#include ]], + [int size = getdtablesize(); + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; + ])], + [gl_cv_func_getdtablesize_works=yes], + [gl_cv_func_getdtablesize_works=no], + [case "$host_os" in + cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows + gl_cv_func_getdtablesize_works="guessing no" ;; + *) gl_cv_func_getdtablesize_works="guessing yes" ;; + esac + ]) + ;; + esac ]) case "$gl_cv_func_getdtablesize_works" in - *yes) ;; + *yes | "no (limitation)") ;; *) REPLACE_GETDTABLESIZE=1 ;; esac else diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 02ce235..d382402 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,9 +1,9 @@ -# serial 19 +# serial 20 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. -# Copyright (C) 1996-1997, 1999-2004, 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,7 @@ dnl A wrapper around AC_FUNC_GETGROUPS. m4_version_prereq([2.70], [] ,[ # This is taken from the following Autoconf patch: -# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 +# https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 AC_DEFUN([AC_FUNC_GETGROUPS], [ AC_REQUIRE([AC_TYPE_GETGROUPS])dnl @@ -40,10 +40,10 @@ AC_DEFUN([AC_FUNC_GETGROUPS], [ac_cv_func_getgroups_works=yes], [ac_cv_func_getgroups_works=no], [case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_getgroups_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; esac ]) ]) @@ -93,10 +93,10 @@ AC_DEFUN([gl_FUNC_GETGROUPS], [gl_cv_func_getgroups_works=yes], [gl_cv_func_getgroups_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_getgroups_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_getgroups_works="guessing no" ;; esac ])]) case "$gl_cv_func_getgroups_works" in diff --git a/m4/getline.m4 b/m4/getline.m4 index dcea772..14b62c9 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,6 +1,6 @@ -# getline.m4 serial 27 +# getline.m4 serial 28 -dnl Copyright (C) 1998-2003, 2005-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl dnl This file is free software; the Free Software Foundation @@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_GETLINE], size_t siz = 0; int len = getline (&line, &siz, in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 2; + { free (line); fclose (in); return 2; } free (line); } { @@ -55,7 +55,7 @@ AC_DEFUN([gl_FUNC_GETLINE], char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getline (&line, &siz, in) == -1) - return 3; + { fclose (in); return 3; } free (line); } fclose (in); diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 7a94626..0496250 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 44 -dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. +# getopt.m4 serial 46 +dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 +32,16 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], # getopt_long_only. AC_DEFUN([gl_FUNC_GETOPT_GNU], [ + dnl Set the variable gl_getopt_required, so that all invocations of + dnl gl_GETOPT_CHECK_HEADERS in the scope of the current configure file + dnl will check for getopt with GNU extensions. + dnl This means that if one gnulib-tool invocation requests getopt-posix + dnl and another gnulib-tool invocation requests getopt-gnu, it is as if + dnl both had requested getopt-gnu. m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) - AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) + dnl No need to invoke gl_FUNC_GETOPT_POSIX here; this is automatically + dnl done through the module dependency getopt-gnu -> getopt-posix. ]) # Determine whether to replace the entire getopt facility. @@ -354,15 +361,19 @@ dnl is ambiguous with environment values that contain newlines. AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [ - GETOPT_H=getopt.h + AC_CHECK_HEADERS_ONCE([sys/cdefs.h]) + if test $ac_cv_header_sys_cdefs_h = yes; then + HAVE_SYS_CDEFS_H=1 + else + HAVE_SYS_CDEFS_H=0 + fi + AC_SUBST([HAVE_SYS_CDEFS_H]) + AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], [Define to rpl_ if the getopt replacement functions and variables should be used.]) + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h AC_SUBST([GETOPT_H]) -]) - -# Prerequisites of lib/getopt*. -AC_DEFUN([gl_PREREQ_GETOPT], -[ - AC_CHECK_DECLS_ONCE([getenv]) + AC_SUBST([GETOPT_CDEFS_H]) ]) diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 3daa008..8e502f0 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -1,5 +1,5 @@ # getpass.m4 serial 14 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getprogname.m4 b/m4/getprogname.m4 index efc06e7..3a9ba8b 100644 --- a/m4/getprogname.m4 +++ b/m4/getprogname.m4 @@ -1,6 +1,6 @@ # getprogname.m4 - check for getprogname or replacements for it -# Copyright (C) 2016-2017 Free Software Foundation, Inc. +# Copyright (C) 2016-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 1cdab27..ad35546 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 8 -dnl Copyright (C) 2002, 2004-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 4f501e5..198695e 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 21 +# serial 25 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2018 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,9 +9,10 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_GETTIMEOFDAY], [ + AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_HEADER_SYS_TIME_H]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([gettimeofday]) gl_gettimeofday_timezone=void @@ -54,19 +55,11 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict); if test $REPLACE_STRUCT_TIMEVAL = 1; then REPLACE_GETTIMEOFDAY=1 fi - m4_ifdef([gl_FUNC_TZSET_CLOBBER], [ - gl_FUNC_TZSET_CLOBBER - case "$gl_cv_func_tzset_clobber" in - *yes) - REPLACE_GETTIMEOFDAY=1 - gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE([tzset], [rpl_tzset], - [Define to rpl_tzset if the wrapper function should be used.]) - AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], - [Define if tzset clobbers localtime's static buffer.]) - ;; - esac - ]) + dnl On mingw, the original gettimeofday has only a precision of 15.6 + dnl milliseconds. So override it. + case "$host_os" in + mingw*) REPLACE_GETTIMEOFDAY=1 ;; + esac fi AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone], [Define this to 'void' or 'struct timezone' to match the system's @@ -85,6 +78,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], [ AC_REQUIRE([gl_HEADER_SYS_TIME_H]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], [gl_cv_func_gettimeofday_clobber], @@ -109,30 +103,24 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], [gl_cv_func_gettimeofday_clobber=yes], [# When cross-compiling: case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; + # Guess all is fine on glibc systems. + *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; esac ])]) case "$gl_cv_func_gettimeofday_clobber" in *yes) REPLACE_GETTIMEOFDAY=1 - gl_GETTIMEOFDAY_REPLACE_LOCALTIME AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], [Define if gettimeofday clobbers the localtime buffer.]) + gl_LOCALTIME_BUFFER_NEEDED ;; esac ]) -AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 -]) - # Prerequisites of lib/gettimeofday.c. -AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [ - AC_CHECK_HEADERS([sys/timeb.h]) - AC_CHECK_FUNCS([_ftime]) -]) +AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:]) diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4 index 5e80189..d6b2141 100644 --- a/m4/gl-openssl.m4 +++ b/m4/gl-openssl.m4 @@ -1,5 +1,5 @@ # gl-openssl.m4 serial 3 -dnl Copyright (C) 2013-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2013-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index 2e30ed6..126aa1a 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,5 +1,5 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 7d9b40b..de65f6b 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 36 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# gnulib-common.m4 serial 38 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -228,13 +228,13 @@ m4_ifndef([AS_VAR_IF], # This is like AC_PROG_CC_C99, except that # - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60, # - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC -# , +# , # but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99 -# . +# . # Remaining problems: # - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options # to CC twice -# . +# . # - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard. AC_DEFUN([gl_PROG_CC_C99], [ @@ -256,7 +256,8 @@ AC_DEFUN([gl_PROG_AR_RANLIB], dnl library formats. In particular, the GNU binutils programs ar and ranlib dnl produce libraries that work only with gcc, not with cc. AC_REQUIRE([AC_PROG_CC]) - AC_BEFORE([$0], [AM_PROG_AR]) + dnl The '][' hides this use from 'aclocal'. + AC_BEFORE([$0], [A][M_PROG_AR]) AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler], [ AC_EGREP_CPP([Amsterdam], @@ -288,7 +289,9 @@ Amsterdam dnl __ACK__. It may seem like its easier to avoid calling the macro here, dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good dnl default value and automake should usually know them). - m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [:]) + dnl + dnl The '][' hides this use from 'aclocal'. + m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:]) fi dnl In case the code above has not helped with setting AR/ARFLAGS, use @@ -456,7 +459,9 @@ m4_ifndef([AC_PROG_SED], else ac_cv_path_SED=$SED fi + ]) SED="$ac_cv_path_SED" AC_SUBST([SED])dnl rm -f conftest.sed -])])]) +]) +]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 311c51a..67ad8a8 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -12,7 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this file. If not, see . +# along with this file. If not, see . # # As a special exception to the GNU General Public License, # this file may be distributed as part of a program that @@ -28,7 +28,7 @@ # other built files. -# This macro should be invoked from ./configure.ac, in the section +# This macro should be invoked from configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([gl_EARLY], @@ -37,11 +37,7 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_ES$])dnl a valid locale name m4_pattern_allow([^gl_LIBOBJS$])dnl a variable m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable - - # Pre-early section. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_PROG_AR_RANLIB]) - AC_REQUIRE([AM_PROG_CC_C_O]) # Code from module absolute-header: # Code from module accept: @@ -86,6 +82,7 @@ AC_DEFUN([gl_EARLY], # Code from module fcntl-h: # Code from module fd-hook: # Code from module fd-safer-flag: + # Code from module filename: # Code from module flexmember: # Code from module float: # Code from module flock: @@ -122,6 +119,7 @@ AC_DEFUN([gl_EARLY], # Code from module group-member: # Code from module hard-locale: # Code from module havelib: + # Code from module host-cpu-c-abi: # Code from module hostent: # Code from module iconv: # Code from module iconv-h: @@ -143,11 +141,13 @@ AC_DEFUN([gl_EARLY], # Code from module localcharset: # Code from module locale: # Code from module localeconv: + # Code from module localtime-buffer: # Code from module lock: # Code from module lseek: # Code from module lstat: # Code from module maintainer-makefile: # Code from module malloc-posix: + # Code from module malloca: # Code from module mbchar: # Code from module mbiter: # Code from module mbrtowc: @@ -290,6 +290,8 @@ AC_DEFUN([gl_EARLY], # Code from module unlocked-io: # Code from module update-copyright: # Code from module useless-if-before-free: + # Code from module utime: + # Code from module utime-h: # Code from module utimens: # Code from module vasnprintf: # Code from module vasprintf: @@ -311,7 +313,7 @@ AC_DEFUN([gl_EARLY], # Code from module xstrndup: ]) -# This macro should be invoked from ./configure.ac, in the section +# This macro should be invoked from configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ @@ -319,14 +321,14 @@ AC_DEFUN([gl_INIT], gl_cond_libtool=false gl_libdeps= gl_ltlibdeps= - gl_m4_base='m4' + gl_m4_base='m4/' m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) m4_pushdef([gl_LIBSOURCES_LIST], []) m4_pushdef([gl_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='lib' + gl_source_base='lib/' AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([accept]) @@ -435,6 +437,11 @@ AC_DEFUN([gl_INIT], gl_FUNC_FSTAT if test $REPLACE_FSTAT = 1; then AC_LIBOBJ([fstat]) + case "$host_os" in + mingw*) + AC_LIBOBJ([stat-w32]) + ;; + esac gl_PREREQ_FSTAT fi gl_SYS_STAT_MODULE_INDICATOR([fstat]) @@ -486,19 +493,13 @@ AC_DEFUN([gl_INIT], fi gl_STDIO_MODULE_INDICATOR([getline]) gl_FUNC_GETOPT_GNU - if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 - fi - AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required + dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are + dnl done in the getopt-posix module. gl_FUNC_GETOPT_POSIX if test $REPLACE_GETOPT = 1; then AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT dnl Arrange for unistd.h to include getopt.h. GNULIB_GL_UNISTD_H_GETOPT=1 fi @@ -547,6 +548,7 @@ AC_DEFUN([gl_INIT], fi gl_UNISTD_MODULE_INDICATOR([group-member]) gl_HARD_LOCALE + AC_REQUIRE([gl_HOST_CPU_C_ABI]) gl_HOSTENT AM_ICONV m4_ifdef([gl_ICONV_MODULE_INDICATOR], @@ -599,6 +601,8 @@ AC_DEFUN([gl_INIT], gl_PREREQ_LOCALECONV fi gl_LOCALE_MODULE_INDICATOR([localeconv]) + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + AC_LIBOBJ([localtime-buffer]) gl_LOCK gl_MODULE_INDICATOR([lock]) gl_FUNC_LSEEK @@ -620,6 +624,7 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([malloc]) fi gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + gl_MALLOCA gl_MBCHAR gl_MBITER gl_FUNC_MBRTOWC @@ -684,7 +689,7 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([mktime]) gl_FUNC_MKTIME_INTERNAL - if test $REPLACE_MKTIME = 1; then + if test $WANT_MKTIME_INTERNAL = 1; then AC_LIBOBJ([mktime]) gl_PREREQ_MKTIME fi @@ -696,6 +701,7 @@ AC_DEFUN([gl_INIT], if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then AC_LIBOBJ([msvc-nothrow]) fi + gl_MODULE_INDICATOR([msvc-nothrow]) gl_MULTIARCH gl_FUNC_NANOSLEEP if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then @@ -885,6 +891,11 @@ AC_DEFUN([gl_INIT], gl_FUNC_STAT if test $REPLACE_STAT = 1; then AC_LIBOBJ([stat]) + case "$host_os" in + mingw*) + AC_LIBOBJ([stat-w32]) + ;; + esac gl_PREREQ_STAT fi gl_SYS_STAT_MODULE_INDICATOR([stat]) @@ -935,6 +946,8 @@ AC_DEFUN([gl_INIT], gl_PREREQ_STRERROR_R fi gl_STRING_MODULE_INDICATOR([strerror_r]) + dnl For the modules argp, error. + gl_MODULE_INDICATOR([strerror_r-posix]) gl_HEADER_STRING_H gl_HEADER_STRINGS_H gl_FUNC_STRNDUP @@ -981,7 +994,7 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P gl_SYS_IOCTL_H AC_PROG_MKDIR_P - gl_HEADER_SYS_SELECT + AC_REQUIRE([gl_HEADER_SYS_SELECT]) AC_PROG_MKDIR_P AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_PROG_MKDIR_P @@ -1017,15 +1030,15 @@ AC_DEFUN([gl_INIT], gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-prefix-context]) gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-suffix-context]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.6], [unicase/tolower]) - gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-tolower]) + gl_LIBUNISTRING_MODULE([0.9.8], [unicase/tolower]) + gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-tolower]) gl_LIBUNISTRING_LIBHEADER([0.9.4], [unictype.h]) - gl_LIBUNISTRING_MODULE([0.9.6], [unictype/combining-class]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class]) AC_REQUIRE([AC_C_INLINE]) - gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-soft-dotted]) + gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-soft-dotted]) gl_LIBUNISTRING_LIBHEADER([0.9.4], [uninorm.h]) gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize]) - gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u8-normalize]) + gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u8-normalize]) gl_UNISTD_H gl_UNISTD_SAFER gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h]) @@ -1037,13 +1050,20 @@ AC_DEFUN([gl_INIT], gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h]) - gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/width]) + gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/width]) gl_FUNC_UNLINK if test $REPLACE_UNLINK = 1; then AC_LIBOBJ([unlink]) fi gl_UNISTD_MODULE_INDICATOR([unlink]) gl_FUNC_GLIBC_UNLOCKED_IO + gl_FUNC_UTIME + if test $HAVE_UTIME = 0 || test $REPLACE_UTIME = 1; then + AC_LIBOBJ([utime]) + gl_PREREQ_UTIME + fi + gl_UTIME_MODULE_INDICATOR([utime]) + gl_UTIME_H gl_UTIMENS gl_FUNC_VASNPRINTF gl_FUNC_VASPRINTF @@ -1128,6 +1148,7 @@ changequote([, ])dnl AC_SUBST([gltests_WITNESS]) gl_module_indicator_condition=$gltests_WITNESS m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) + m4_popdef([gl_MODULE_INDICATOR_CONDITION]) m4_ifval(gltests_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || @@ -1163,6 +1184,8 @@ changequote([, ])dnl AC_SUBST([LIBGNU_LIBDEPS]) LIBGNU_LTLIBDEPS="$gl_ltlibdeps" AC_SUBST([LIBGNU_LTLIBDEPS]) + LIBTESTS_LIBDEPS="$gltests_libdeps" + AC_SUBST([LIBTESTS_LIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -1186,7 +1209,7 @@ AC_DEFUN([gl_REPLACE_FUNCS], [ AC_DEFUN([gl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([gl_LIBSOURCES_DIR], [lib]) + m4_define([gl_LIBSOURCES_DIR], [lib/]) m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) @@ -1227,17 +1250,14 @@ AC_DEFUN([gl_FILE_LIST], [ build-aux/git-version-gen build-aux/gitlog-to-changelog build-aux/gnupload - build-aux/snippet/_Noreturn.h - build-aux/snippet/arg-nonnull.h - build-aux/snippet/c++defs.h - build-aux/snippet/unused-parameter.h - build-aux/snippet/warn-on-use.h build-aux/update-copyright build-aux/useless-if-before-free build-aux/vc-list-files + lib/_Noreturn.h lib/accept.c lib/alloca.c lib/alloca.in.h + lib/arg-nonnull.h lib/arpa_inet.in.h lib/array-mergesort.h lib/asnprintf.c @@ -1250,6 +1270,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/binary-io.h lib/bind.c lib/btowc.c + lib/c++defs.h lib/c-ctype.c lib/c-ctype.h lib/c-strcase.h @@ -1283,6 +1304,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fd-hook.h lib/fd-safer-flag.c lib/fd-safer.c + lib/filename.h lib/flexmember.h lib/float+.h lib/float.c @@ -1304,6 +1326,11 @@ AC_DEFUN([gl_FILE_LIST], [ lib/getdtablesize.c lib/getgroups.c lib/getline.c + lib/getopt-cdefs.in.h + lib/getopt-core.h + lib/getopt-ext.h + lib/getopt-pfx-core.h + lib/getopt-pfx-ext.h lib/getopt.c lib/getopt.in.h lib/getopt1.c @@ -1340,9 +1367,14 @@ AC_DEFUN([gl_FILE_LIST], [ lib/localcharset.h lib/locale.in.h lib/localeconv.c + lib/localtime-buffer.c + lib/localtime-buffer.h lib/lseek.c lib/lstat.c lib/malloc.c + lib/malloca.c + lib/malloca.h + lib/malloca.valgrind lib/mbchar.c lib/mbchar.h lib/mbiter.c @@ -1441,6 +1473,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/spawnp.c lib/stat-time.c lib/stat-time.h + lib/stat-w32.c + lib/stat-w32.h lib/stat.c lib/stdalign.in.h lib/stdbool.in.h @@ -1507,7 +1541,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/unicase/simple-mapping.h lib/unicase/special-casing-table.gperf lib/unicase/special-casing.c - lib/unicase/special-casing.h + lib/unicase/special-casing.in.h lib/unicase/tolower.c lib/unicase/tolower.h lib/unicase/u-casemap.h @@ -1544,6 +1578,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/uniwidth/width.c lib/unlink.c lib/unlocked-io.h + lib/unused-parameter.h + lib/utime.c + lib/utime.in.h lib/utimens.c lib/utimens.h lib/vasnprintf.c @@ -1556,6 +1593,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/wait-process.c lib/wait-process.h lib/waitpid.c + lib/warn-on-use.h lib/wchar.in.h lib/wcrtomb.c lib/wctype-h.c @@ -1626,6 +1664,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/gnulib-common.m4 m4/group-member.m4 m4/hard-locale.m4 + m4/host-cpu-c-abi.m4 m4/hostent.m4 m4/iconv.m4 m4/iconv_h.m4 @@ -1660,11 +1699,13 @@ AC_DEFUN([gl_FILE_LIST], [ m4/locale-zh.m4 m4/locale_h.m4 m4/localeconv.m4 + m4/localtime-buffer.m4 m4/lock.m4 m4/longlong.m4 m4/lseek.m4 m4/lstat.m4 m4/malloc.m4 + m4/malloca.m4 m4/math_h.m4 m4/mbchar.m4 m4/mbiter.m4 @@ -1694,6 +1735,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/nls.m4 m4/nocrash.m4 m4/off_t.m4 + m4/open-cloexec.m4 m4/open.m4 m4/pathmax.m4 m4/pipe.m4 @@ -1775,7 +1817,8 @@ AC_DEFUN([gl_FILE_LIST], [ m4/unistd_h.m4 m4/unlink.m4 m4/unlocked-io.m4 - m4/utimbuf.m4 + m4/utime.m4 + m4/utime_h.m4 m4/utimens.m4 m4/utimes.m4 m4/vasnprintf.m4 @@ -1795,6 +1838,12 @@ AC_DEFUN([gl_FILE_LIST], [ m4/xalloc.m4 m4/xsize.m4 m4/xstrndup.m4 + tests=lib/_Noreturn.h + tests=lib/arg-nonnull.h + tests=lib/c++defs.h + tests=lib/dummy.c + tests=lib/unused-parameter.h + tests=lib/warn-on-use.h top/GNUmakefile top/maint.mk ]) diff --git a/m4/group-member.m4 b/m4/group-member.m4 index a68538d..2a14dcf 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,6 +1,6 @@ # serial 14 -# Copyright (C) 1999-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4 index d79acd6..1922223 100644 --- a/m4/hard-locale.m4 +++ b/m4/hard-locale.m4 @@ -1,5 +1,5 @@ # hard-locale.m4 serial 8 -dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 new file mode 100644 index 0000000..dd7c523 --- /dev/null +++ b/m4/host-cpu-c-abi.m4 @@ -0,0 +1,369 @@ +# host-cpu-c-abi.m4 serial 8 +dnl Copyright (C) 2002-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free 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 and Sam Steingold. + +dnl Sets the HOST_CPU variable to the canonical name of the CPU. +dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its +dnl C language ABI (application binary interface). +dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in +dnl config.h. +dnl +dnl This canonical name can be used to select a particular assembly language +dnl source file that will interoperate with C code on the given host. +dnl +dnl For example: +dnl * 'i386' and 'sparc' are different canonical names, because code for i386 +dnl will not run on SPARC CPUs and vice versa. They have different +dnl instruction sets. +dnl * 'sparc' and 'sparc64' are different canonical names, because code for +dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code +dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit +dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit +dnl mode, but not both. +dnl * 'mips' and 'mipsn32' are different canonical names, because they use +dnl different argument passing and return conventions for C functions, and +dnl although the instruction set of 'mips' is a large subset of the +dnl instruction set of 'mipsn32'. +dnl * 'mipsn32' and 'mips64' are different canonical names, because they use +dnl different sizes for the C types like 'int' and 'void *', and although +dnl the instruction sets of 'mipsn32' and 'mips64' are the same. +dnl * The same canonical name is used for different endiannesses. You can +dnl determine the endianness through preprocessor symbols: +dnl - 'arm': test __ARMEL__. +dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL. +dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN. +dnl * The same name 'i386' is used for CPUs of type i386, i486, i586 +dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because +dnl - Instructions that do not exist on all of these CPUs (cmpxchg, +dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your +dnl assembly language source files use such instructions, you will +dnl need to make the distinction. +dnl - Speed of execution of the common instruction set is reasonable across +dnl the entire family of CPUs. If you have assembly language source files +dnl that are optimized for particular CPU types (like GNU gmp has), you +dnl will need to make the distinction. +dnl See . +AC_DEFUN([gl_HOST_CPU_C_ABI], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_C_ASM]) + AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi], + [case "$host_cpu" in + +changequote(,)dnl + i[4567]86 ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=i386 + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=x86_64-x32], + [gl_cv_host_cpu_c_abi=x86_64])], + [gl_cv_host_cpu_c_abi=i386]) + ;; + +changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __aarch64__ + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=arm64-ilp32], + [gl_cv_host_cpu_c_abi=arm64])], + [# Don't distinguish little-endian and big-endian arm, since they + # don't require different machine code for simple operations and + # since the user can distinguish them through the preprocessor + # defines __ARMEL__ vs. __ARMEB__. + # But distinguish arm which passes floating-point arguments and + # return values in integer registers (r0, r1, ...) - this is + # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which + # passes them in float registers (s0, s1, ...) and double registers + # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer + # sets the preprocessor defines __ARM_PCS (for the first case) and + # __ARM_PCS_VFP (for the second case), but older GCC does not. + echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c + # Look for a reference to the register d0 in the .s file. + AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 + if LC_ALL=C grep -E 'd0,' conftest.$gl_asmext >/dev/null; then + gl_cv_host_cpu_c_abi=armhf + else + gl_cv_host_cpu_c_abi=arm + fi + rm -f conftest* + ]) + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=hppa64], + [gl_cv_host_cpu_c_abi=hppa]) + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=ia64-ilp32], + [gl_cv_host_cpu_c_abi=ia64]) + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mips64], + [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIN32. + # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIO32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (_MIPS_SIM == _ABIN32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mipsn32], + [gl_cv_host_cpu_c_abi=mips])]) + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + ]])], + [# On powerpc64, there are two ABIs on Linux: The AIX compatible + # one and the ELFv2 one. The latter defines _CALL_ELF=2. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _CALL_ELF && _CALL_ELF == 2 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=powerpc64-elfv2], + [gl_cv_host_cpu_c_abi=powerpc64]) + ], + [gl_cv_host_cpu_c_abi=powerpc]) + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi=powerpc + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=s390x], + [gl_cv_host_cpu_c_abi=s390]) + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=sparc64], + [gl_cv_host_cpu_c_abi=sparc]) + ;; + + *) + gl_cv_host_cpu_c_abi="$host_cpu" + ;; + esac + ]) + + dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same. + HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'` + HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi" + AC_SUBST([HOST_CPU]) + AC_SUBST([HOST_CPU_C_ABI]) + + # This was + # AC_DEFINE_UNQUOTED([__${HOST_CPU}__]) + # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__]) + # earlier, but KAI C++ 3.2d doesn't like this. + sed -e 's/-/_/g' >> confdefs.h <, and it uses stdcall calling convention, not cdecl dnl (hence we cannot use AC_CHECK_FUNCS, AC_SEARCH_LIBS to find it). @@ -35,7 +36,7 @@ AC_DEFUN([gl_FUNC_INET_NTOP], fi else gl_save_LIBS=$LIBS - AC_SEARCH_LIBS([inet_ntop], [nsl resolv], [], + AC_SEARCH_LIBS([inet_ntop], [nsl resolv network], [], [AC_CHECK_FUNCS([inet_ntop]) if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 diff --git a/m4/inline.m4 b/m4/inline.m4 index f00572e..52f2b7b 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index ff143e9..7ab676e 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 8 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index 2055787..c844262 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 434a7ee..8069493 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 26 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 9240305..954848b 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index 30209dd..835338a 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ -# ioctl.m4 serial 4 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# ioctl.m4 serial 5 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -23,7 +23,10 @@ AC_DEFUN([gl_FUNC_IOCTL], [gl_cv_func_ioctl_posix_signature], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[#include ]], + [[#include + /* On some platforms, ioctl() is declared in . */ + #include + ]], [[extern #ifdef __cplusplus "C" diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index e9d6975..4906a47 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 4 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index ea94b4e..9ae375c 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 790f7c0..bec7cd1 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,6 +1,6 @@ # Enable large files on systems where this is not the default. -# Copyright 1992-1996, 1998-2017 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2018 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. @@ -126,9 +126,24 @@ AC_DEFUN([gl_LARGEFILE], else WINDOWS_64_BIT_OFF_T=0 fi - dnl But all native Windows platforms (including mingw64) have a 32-bit - dnl st_size member in 'struct stat'. - WINDOWS_64_BIT_ST_SIZE=1 + dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat' + dnl to 'struct _stat32i64' or 'struct _stat64' (depending on + dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member. + AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + struct stat buf; + int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; + ]], + [[]])], + [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no]) + ]) + if test $gl_cv_member_st_size_64 = no; then + WINDOWS_64_BIT_ST_SIZE=1 + else + WINDOWS_64_BIT_ST_SIZE=0 + fi ;; *) dnl Nothing to do on gnulib's side. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index a7733e4..1244ff8 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc. +# lib-ld.m4 serial 9 +dnl Copyright (C) 1996-2003, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -47,73 +47,122 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. +if test -n "$LD"; then + AC_MSG_CHECKING([for ld]) +elif test "$GCC" = yes; then AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` - while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac elif test "$with_gnu_ld" = yes; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL([acl_cv_path_LD], -[if test -z "$LD"; then - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 &5 | tr -d '\015'` ;; + *) + acl_output=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $acl_output in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` + while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do + acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` + done + # Got the pathname. No search in PATH is needed. + acl_cv_path_LD="$acl_output" + ac_prog= + ;; + "") + # If it fails, then pretend we aren't using GCC. + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; esac fi - done - IFS="$acl_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" + if test -n "$ac_prog"; then + # Search for $ac_prog in $PATH. + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 Solaris 64-bit Developer's Guide > The Development Environment - dnl . - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_EGREP_CPP([sixtyfour bits], [ -#ifdef _LP64 -sixtyfour bits -#endif - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) - ]) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + AC_REQUIRE([gl_HOST_CPU_C_ABI]) + dnl Allow the user to override the result by setting acl_cv_libdirstems. + AC_CACHE_CHECK([for the common suffixes of directories in the library search path], + [acl_cv_libdirstems], + [acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef _LP64 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_solaris_64bit=yes], + [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + dnl If $CC generates code for a 32-bit ABI, the libraries are + dnl surely under $prefix/lib, not $prefix/lib64. + case "$gl_cv_host_cpu_c_abi" in + i386 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | s390 | sparc) + ;; + *) # x86_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64* | s390x | sparc64 | ... + dnl The result is a property of the system. However, non-system + dnl compilers sometimes have odd library search paths. Therefore + dnl prefer asking /usr/bin/gcc, if available, rather than $CC. + searchpath=`(if test -f /usr/bin/gcc \ + && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ + LC_ALL=C /usr/bin/gcc -print-search-dirs; \ + else \ + LC_ALL=C $CC -print-search-dirs; \ + fi) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" + ]) + # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. + acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` + acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` ]) diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index ee648f2..1587f36 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring-optional.m4 b/m4/libunistring-optional.m4 index f81ecb5..3ea0909 100644 --- a/m4/libunistring-optional.m4 +++ b/m4/libunistring-optional.m4 @@ -1,5 +1,5 @@ # libunistring-optional.m4 serial 1 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 0249896..c3b9e00 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,5 +1,5 @@ # libunistring.m4 serial 11 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 443f91b..511dcef 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -1,6 +1,6 @@ dnl Check whether limits.h has needed features. -dnl Copyright 2016-2017 Free Software Foundation, Inc. +dnl Copyright 2016-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/link.m4 b/m4/link.m4 index 021c301..b0b3ff2 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ -# link.m4 serial 8 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +# link.m4 serial 9 +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,10 +39,10 @@ AC_DEFUN([gl_FUNC_LINK], ]])], [gl_cv_func_link_works=yes], [gl_cv_func_link_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_link_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_link_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_link_works="guessing no" ;; esac ]) rm -f conftest.a conftest.b conftest.lnk]) diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 0c1ff38..2d7ca64 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 93d3da7..30a1d94 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 17 -dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. +# locale-fr.m4 serial 18 +dnl Copyright (C) 2003, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,8 +24,14 @@ changequote(,)dnl 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -33,9 +39,9 @@ int main () { if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -44,32 +50,33 @@ int main () { some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# 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; -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ +# if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ /* 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; -#endif +# endif return 0; +#endif } changequote([,])dnl ])]) diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index c1d1154..2c34006 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 12 -dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. +# locale-ja.m4 serial 13 +dnl Copyright (C) 2003, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,9 +25,14 @@ struct tm t; char buf[16]; int main () { - const char *p; + /* 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -35,9 +40,9 @@ int main () if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -46,32 +51,36 @@ int main () some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# 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 (except on MirBSD). */ - 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; + { + const char *p; + 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; +#endif } changequote([,])dnl ])]) diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 1459418..f7e1901 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 12 -dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. +# locale-zh.m4 serial 13 +dnl Copyright (C) 2003, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 +26,14 @@ struct tm t; char buf[16]; int main () { - const char *p; + /* 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__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE @@ -36,9 +41,9 @@ int main () if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) return 1; -#else +# else if (setlocale (LC_ALL, "") == NULL) return 1; -#endif +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -47,32 +52,36 @@ int main () some unit tests fail. On MirBSD 10, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -#if HAVE_LANGINFO_CODESET +# if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 || strcmp (cs, "UTF-8") == 0) return 1; } -#endif -#ifdef __CYGWIN__ +# 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 +# endif /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. This excludes the UTF-8 encoding (except on MirBSD). */ - 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; + { + const char *p; + 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; +#endif } changequote([,])dnl ])]) diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 7426a65..4bd9e57 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 19 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +# locale_h.m4 serial 20 +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ AC_DEFUN([gl_LOCALE_H], dnl If is replaced, then must also be replaced. AC_REQUIRE([gl_STDDEF_H]) - dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv' + dnl Solaris 11.0 defines the int_p_*, int_n_* members of 'struct lconv' dnl only if _LCONV_C99 is defined. AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index c287aa5..517f398 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localtime-buffer.m4 b/m4/localtime-buffer.m4 new file mode 100644 index 0000000..4b3ec57 --- /dev/null +++ b/m4/localtime-buffer.m4 @@ -0,0 +1,21 @@ +# localtime-buffer.m4 serial 1 +dnl Copyright (C) 2017-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_LOCALTIME_BUFFER_DEFAULTS], +[ + NEED_LOCALTIME_BUFFER=0 +]) + +dnl Macro invoked from other modules, to signal that the compilation of +dnl module 'localtime-buffer' is needed. +AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED], +[ + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + NEED_LOCALTIME_BUFFER=1 + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 +]) diff --git a/m4/lock.m4 b/m4/lock.m4 index cb04a67..dac4c38 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ # lock.m4 serial 14 -dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/longlong.m4 b/m4/longlong.m4 index 9a3294b..27e6326 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lseek.m4 b/m4/lseek.m4 index 627e772..423b9fb 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ # lseek.m4 serial 10 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 953c117..ac6f143 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 27 +# serial 31 -# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,14 +10,15 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_LSTAT], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) dnl If lstat does not exist, the replacement does dnl "#define lstat stat", and lstat.c is a no-op. AC_CHECK_FUNCS_ONCE([lstat]) if test $ac_cv_func_lstat = yes; then AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - case "$gl_cv_func_lstat_dereferences_slashed_symlink" in - *no) + case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in + solaris* | *no) REPLACE_LSTAT=1 ;; esac @@ -33,6 +34,7 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [ dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ. + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether lstat correctly handles trailing slash], [gl_cv_func_lstat_dereferences_slashed_symlink], [rm -f conftest.sym conftest.file @@ -51,9 +53,12 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [gl_cv_func_lstat_dereferences_slashed_symlink=yes], [gl_cv_func_lstat_dereferences_slashed_symlink=no], [case "$host_os" in - *-gnu*) + *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + mingw*) + # Guess no on native Windows. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) # If we don't know, assume the worst. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; diff --git a/m4/malloc.m4 b/m4/malloc.m4 index e1d2ec6..0ded9ba 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ -# malloc.m4 serial 15 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +# malloc.m4 serial 16 +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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. m4_version_prereq([2.70], [] ,[ # This is adapted with modifications from upstream Autoconf here: -# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_MALLOC_IF], [ AC_REQUIRE([AC_HEADER_STDC])dnl @@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], [ac_cv_func_malloc_0_nonnull=no], [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ + *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull=yes ;; # If we don't know, assume the worst. diff --git a/m4/malloca.m4 b/m4/malloca.m4 new file mode 100644 index 0000000..2251e61 --- /dev/null +++ b/m4/malloca.m4 @@ -0,0 +1,15 @@ +# malloca.m4 serial 1 +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2018 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_MALLOCA], +[ + dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables + dnl @ALLOCA@ and @LTALLOCA@. + dnl gl_FUNC_ALLOCA dnl Already brought in by the module dependencies. + AC_REQUIRE([gl_EEMALLOC]) + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) +]) diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index 60ea124..2ecb4d4 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 9 -dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index add4034..8ffa6f4 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ # mbiter.m4 serial 7 -dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 536183f..f789875 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 27 -*- coding: utf-8 -*- -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 Free Software Foundation, +# mbrtowc.m4 serial 30 -*- coding: utf-8 -*- +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -563,10 +563,11 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on AIX and glibc systems. - aix* | *-gnu*) - gl_cv_func_mbrtowc_empty_input="guessing no" ;; - *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + # Guess no on AIX and glibc systems. + aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; + *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; esac changequote([,])dnl AC_RUN_IFELSE( @@ -592,6 +593,7 @@ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932 AC_DEFUN([gl_MBRTOWC_C_LOCALE], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether the C locale is free of encoding errors], [gl_cv_C_locale_sans_EILSEQ], [ @@ -622,7 +624,12 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], ]])], [gl_cv_C_locale_sans_EILSEQ=yes], [gl_cv_C_locale_sans_EILSEQ=no], - [:])]) + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + esac + ]) + ]) ]) # Prerequisites of lib/mbrtowc.c. @@ -639,7 +646,7 @@ 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], - gl_cv_func_mbrtowc, + [gl_cv_func_mbrtowc], [AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[/* Tru64 with Desktop Toolkit C has a bug: must be @@ -655,8 +662,8 @@ AC_DEFUN([AC_FUNC_MBRTOWC], size_t n = 1; mbstate_t state; return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));]])], - gl_cv_func_mbrtowc=yes, - gl_cv_func_mbrtowc=no)]) + [gl_cv_func_mbrtowc=yes], + [gl_cv_func_mbrtowc=no])]) if test $gl_cv_func_mbrtowc = yes; then AC_DEFINE([HAVE_MBRTOWC], [1], [Define to 1 if mbrtowc and mbstate_t are properly declared.]) diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index 5904a51..5cba3df 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index 79b8d76..871dd96 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 6325cf3..004aa0d 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 13 -dnl Copyright (C) 2000-2002, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index 378a4e2..ecac6a2 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/md4.m4 b/m4/md4.m4 index e40c7c4..4ec3587 100644 --- a/m4/md4.m4 +++ b/m4/md4.m4 @@ -1,5 +1,5 @@ # md4.m4 serial 7 -dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/md5.m4 b/m4/md5.m4 index 6d922da..5f64f6e 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,5 +1,5 @@ # md5.m4 serial 14 -dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index b6ec814..83c65c1 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,11 +1,13 @@ -# memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc. +# memchr.m4 serial 13 +dnl Copyright (C) 2002-2004, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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_ONCE([gl_FUNC_MEMCHR], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl Check for prerequisites for memory fence checks. gl_FUNC_MMAP_ANON AC_CHECK_HEADERS_ONCE([sys/mman.h]) @@ -23,10 +25,10 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], if test $HAVE_MEMCHR = 1; then # Detect platform-specific bugs in some versions of glibc: # memchr should not dereference anything with length 0 - # http://bugzilla.redhat.com/499689 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 # memchr should not dereference overestimated length after a match - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 - # http://sourceware.org/bugzilla/show_bug.cgi?id=10162 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 + # https://sourceware.org/bugzilla/show_bug.cgi?id=10162 # Assume that memchr works on platforms that lack mprotect. AC_CACHE_CHECK([whether memchr works], [gl_cv_func_memchr_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ @@ -73,12 +75,21 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], result |= 4; } return result; -]])], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no], - [dnl Be pessimistic for now. - gl_cv_func_memchr_works="guessing no"])]) - if test "$gl_cv_func_memchr_works" != yes; then - REPLACE_MEMCHR=1 - fi +]])], + [gl_cv_func_memchr_works=yes], + [gl_cv_func_memchr_works=no], + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # Be pessimistic for now. + *) gl_cv_func_memchr_works="guessing no" ;; + esac + ]) + ]) + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac fi ]) diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index e180f61..a036b39 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ # memrchr.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/minmax.m4 b/m4/minmax.m4 index 6845fce..5e88508 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index 5eec622..cea85a2 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ -# serial 11 +# serial 13 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2018 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. @@ -23,10 +23,19 @@ AC_DEFUN([gl_FUNC_MKDIR], [gl_cv_func_mkdir_trailing_slash_works=yes], [gl_cv_func_mkdir_trailing_slash_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_mkdir_trailing_slash_works="guessing yes"], + [gl_cv_func_mkdir_trailing_slash_works="guessing no"]) + ;; + # If we don't know, assume the worst. + *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; esac ]) rm -rf conftest.dir @@ -49,10 +58,12 @@ AC_DEFUN([gl_FUNC_MKDIR], [gl_cv_func_mkdir_trailing_dot_works=yes], [gl_cv_func_mkdir_trailing_dot_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; esac ]) rm -rf conftest.dir diff --git a/m4/mkostemp.m4 b/m4/mkostemp.m4 index 337f17b..245598e 100644 --- a/m4/mkostemp.m4 +++ b/m4/mkostemp.m4 @@ -1,5 +1,5 @@ # mkostemp.m4 serial 2 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index 31b9b8b..1407ed9 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ -#serial 23 +#serial 25 -# Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2018 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. @@ -57,10 +57,12 @@ AC_DEFUN([gl_FUNC_MKSTEMP], [gl_cv_func_working_mkstemp=yes], [gl_cv_func_working_mkstemp=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_mkstemp="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_working_mkstemp="guessing no" ;; esac ]) rm -rf conftest.mkstemp diff --git a/m4/mktime.m4 b/m4/mktime.m4 index d594ddc..4b3e399 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -# serial 27 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, +# serial 30 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -21,10 +21,11 @@ AC_DEFUN([gl_TIME_T_IS_SIGNED], fi ]) -AC_DEFUN([gl_FUNC_MKTIME], +dnl Test whether mktime works. Set gl_cv_func_working_mktime. +AC_DEFUN([gl_FUNC_MKTIME_WORKS], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([gl_TIME_T_IS_SIGNED]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained dnl in Autoconf and because it invokes AC_LIBOBJ. @@ -54,6 +55,10 @@ AC_DEFUN([gl_FUNC_MKTIME], # include #endif +#ifndef TIME_T_IS_SIGNED +# define TIME_T_IS_SIGNED 0 +#endif + /* Work around redefinition to rpl_putenv by other config tests. */ #undef putenv @@ -239,29 +244,55 @@ main () }]])], [gl_cv_func_working_mktime=yes], [gl_cv_func_working_mktime=no], - [gl_cv_func_working_mktime=no]) + [case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_working_mktime="guessing no" ;; + *) gl_cv_func_working_mktime="guessing no" ;; + esac + ]) ]) +]) + +dnl Main macro of module 'mktime'. +AC_DEFUN([gl_FUNC_MKTIME], +[ + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - if test $gl_cv_func_working_mktime = no; then + REPLACE_MKTIME=0 + if test "$gl_cv_func_working_mktime" != yes; then REPLACE_MKTIME=1 - else - REPLACE_MKTIME=0 + AC_DEFINE([NEED_MKTIME_WORKING], [1], + [Define if the compilation of mktime.c should define 'mktime' + with the algorithmic workarounds.]) fi + case "$host_os" in + mingw*) + REPLACE_MKTIME=1 + AC_DEFINE([NEED_MKTIME_WINDOWS], [1], + [Define if the compilation of mktime.c should define 'mktime' + with the native Windows TZ workaround.]) + ;; + esac ]) +dnl Main macro of module 'mktime-internal'. AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ - AC_REQUIRE([gl_FUNC_MKTIME]) - if test $REPLACE_MKTIME = 0; then - dnl BeOS has __mktime_internal in libc, but other platforms don't. - AC_CHECK_FUNC([__mktime_internal], - [AC_DEFINE([mktime_internal], [__mktime_internal], - [Define to the real name of the mktime_internal function.]) - ], - [dnl mktime works but it doesn't export __mktime_internal, - dnl so we need to substitute our own mktime implementation. - REPLACE_MKTIME=1 - ]) - fi + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + + WANT_MKTIME_INTERNAL=0 + dnl BeOS has __mktime_internal in libc, but other platforms don't. + AC_CHECK_FUNC([__mktime_internal], + [AC_DEFINE([mktime_internal], [__mktime_internal], + [Define to the real name of the mktime_internal function.]) + ], + [dnl mktime works but it doesn't export __mktime_internal, + dnl so we need to substitute our own mktime implementation. + WANT_MKTIME_INTERNAL=1 + AC_DEFINE([NEED_MKTIME_INTERNAL], [1], + [Define if the compilation of mktime.c should define 'mktime_internal'.]) + ]) ]) # Prerequisites of lib/mktime.c. diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 263687d..55fea82 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 10 -dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index 75d372a..83e276c 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index 3324375..55baeec 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 3014661..74ae427 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 30006cb..38a11cc 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 7 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 5590696..8903734 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 36 +# serial 37 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,6 +106,8 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], [case "$host_os" in dnl (( linux*) # Guess it halfway works when the kernel is Linux. gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; + mingw*) # Guess no on native Windows. + gl_cv_func_nanosleep='guessing no' ;; *) # If we don't know, assume the worst. gl_cv_func_nanosleep='guessing no' ;; esac diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 index 3a34d25..7b678cd 100644 --- a/m4/netdb_h.m4 +++ b/m4/netdb_h.m4 @@ -1,5 +1,5 @@ # netdb_h.m4 serial 11 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index f936657..473e142 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,5 +1,5 @@ # netinet_in_h.m4 serial 5 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 16de8de..9ac25f0 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 5 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 2c2c5fb..87b2d4c 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 4 -dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index 92c45ef..f4d5787 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4 new file mode 100644 index 0000000..a272784 --- /dev/null +++ b/m4/open-cloexec.m4 @@ -0,0 +1,21 @@ +# Test whether O_CLOEXEC is defined. + +dnl Copyright 2017-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_PREPROC_O_CLOEXEC], +[ + AC_CACHE_CHECK([for O_CLOEXEC], + [gl_cv_macro_O_CLOEXEC], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include + #ifndef O_CLOEXEC + choke me; + #endif + ]], + [[return O_CLOEXEC;]])], + [gl_cv_macro_O_CLOEXEC=yes], + [gl_cv_macro_O_CLOEXEC=no])]) +]) diff --git a/m4/open.m4 b/m4/open.m4 index 2a869dc..8b3d402 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ -# open.m4 serial 14 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# open.m4 serial 15 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_OPEN], [ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_PREPROC_O_CLOEXEC]) case "$host_os" in mingw* | pw*) REPLACE_OPEN=1 @@ -15,6 +16,9 @@ AC_DEFUN([gl_FUNC_OPEN], dnl open("foo/") should not create a file when the file name has a dnl trailing slash. FreeBSD only has the problem on symlinks. AC_CHECK_FUNCS_ONCE([lstat]) + if test "$gl_cv_macro_O_CLOEXEC" != yes; then + REPLACE_OPEN=1 + fi AC_CACHE_CHECK([whether open recognizes a trailing slash], [gl_cv_func_open_slash], [# Assume that if we have lstat, we can also check symlinks. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index c6c9f24..403a375 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/pipe.m4 b/m4/pipe.m4 index c35b32c..1d3e274 100644 --- a/m4/pipe.m4 +++ b/m4/pipe.m4 @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pipe2.m4 b/m4/pipe2.m4 index 7393343..c081b44 100644 --- a/m4/pipe2.m4 +++ b/m4/pipe2.m4 @@ -1,5 +1,5 @@ # pipe2.m4 serial 2 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4 index 7bc38ba..685f0f4 100644 --- a/m4/posix_spawn.m4 +++ b/m4/posix_spawn.m4 @@ -1,5 +1,5 @@ -# posix_spawn.m4 serial 11 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# posix_spawn.m4 serial 14 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -224,7 +224,7 @@ main () [if test -s conftest$ac_exeext \ && ./conftest$ac_exeext > conftest.out \ && echo 'This should be seen only once.' > conftest.ok \ - && cmp conftest.out conftest.ok > /dev/null; then + && cmp conftest.out conftest.ok >/dev/null 2>&1; then gl_cv_func_posix_spawn_works=yes else gl_cv_func_posix_spawn_works=no @@ -410,7 +410,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE], if test $REPLACE_POSIX_SPAWN = 1; then REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=1 else - dnl On Solaris 11 2011-11, posix_spawn_file_actions_addclose succeeds even + dnl On Solaris 11.0, posix_spawn_file_actions_addclose succeeds even dnl if the fd argument is out of range. AC_CACHE_CHECK([whether posix_spawn_file_actions_addclose works], [gl_cv_func_posix_spawn_file_actions_addclose_works], @@ -430,8 +430,10 @@ int main () [gl_cv_func_posix_spawn_file_actions_addclose_works=no], [# Guess no on Solaris, yes otherwise. case "$host_os" in - solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no";; - *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes";; + solaris*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing no" ;; + *) gl_cv_func_posix_spawn_file_actions_addclose_works="guessing yes" ;; esac ]) ]) @@ -451,7 +453,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2], if test $REPLACE_POSIX_SPAWN = 1; then REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=1 else - dnl On Solaris 11 2011-11, posix_spawn_file_actions_adddup2 succeeds even + dnl On Solaris 11.0, posix_spawn_file_actions_adddup2 succeeds even dnl if the fd argument is out of range. AC_CACHE_CHECK([whether posix_spawn_file_actions_adddup2 works], [gl_cv_func_posix_spawn_file_actions_adddup2_works], @@ -472,6 +474,8 @@ int main () [# Guess no on Solaris, yes otherwise. case "$host_os" in solaris*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_adddup2_works="guessing yes";; esac ]) @@ -492,7 +496,7 @@ AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN], if test $REPLACE_POSIX_SPAWN = 1; then REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 else - dnl On Solaris 11 2011-11, posix_spawn_file_actions_addopen succeeds even + dnl On Solaris 11.0, posix_spawn_file_actions_addopen succeeds even dnl if the fd argument is out of range. AC_CACHE_CHECK([whether posix_spawn_file_actions_addopen works], [gl_cv_func_posix_spawn_file_actions_addopen_works], @@ -515,6 +519,8 @@ int main () [# Guess no on Solaris, yes otherwise. case "$host_os" in solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no" ;; *) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";; esac ]) diff --git a/m4/printf.m4 b/m4/printf.m4 index a44ac66..82f48bf 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 52 -dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. +# printf.m4 serial 58 +dnl Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -58,10 +58,10 @@ int main () [gl_cv_func_printf_sizes_c99=yes], [gl_cv_func_printf_sizes_c99=no], [ -changequote(,)dnl case "$host_os" in +changequote(,)dnl # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; + *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; @@ -79,10 +79,19 @@ changequote(,)dnl netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) gl_cv_func_printf_sizes_c99="guessing no";; netbsd*) gl_cv_func_printf_sizes_c99="guessing yes";; +changequote([,])dnl + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_printf_sizes_c99="guessing yes"], + [gl_cv_func_printf_sizes_c99="guessing no"]) + ;; # If we don't know, assume the worst. *) gl_cv_func_printf_sizes_c99="guessing no";; esac -changequote([,])dnl ]) ]) ]) @@ -122,14 +131,19 @@ int main () }]])], [gl_cv_func_printf_long_double=yes], [gl_cv_func_printf_long_double=no], - [ -changequote(,)dnl - case "$host_os" in - beos*) gl_cv_func_printf_long_double="guessing no";; - mingw* | pw*) gl_cv_func_printf_long_double="guessing no";; - *) gl_cv_func_printf_long_double="guessing yes";; + [case "$host_os" in + beos*) gl_cv_func_printf_long_double="guessing no";; + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_printf_long_double="guessing yes"], + [gl_cv_func_printf_long_double="guessing no"]) + ;; + *) gl_cv_func_printf_long_double="guessing yes";; esac -changequote([,])dnl ]) ]) ]) @@ -217,10 +231,10 @@ int main () [gl_cv_func_printf_infinite=yes], [gl_cv_func_printf_infinite=no], [ -changequote(,)dnl case "$host_os" in +changequote(,)dnl # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_infinite="guessing yes";; + *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; @@ -236,10 +250,19 @@ changequote(,)dnl netbsd*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_printf_infinite="guessing yes";; +changequote([,])dnl + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_printf_infinite="guessing yes"], + [gl_cv_func_printf_infinite="guessing no"]) + ;; # If we don't know, assume the worst. *) gl_cv_func_printf_infinite="guessing no";; esac -changequote([,])dnl ]) ]) ]) @@ -419,27 +442,35 @@ int main () }]])], [gl_cv_func_printf_infinite_long_double=yes], [gl_cv_func_printf_infinite_long_double=no], - [ -changequote(,)dnl - case "$host_cpu" in + [case "$host_cpu" in # Guess no on ia64, x86_64, i386. ia64 | x86_64 | i*86) gl_cv_func_printf_infinite_long_double="guessing no";; *) case "$host_os" in +changequote(,)dnl # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; + *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on HP-UX >= 11. hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";; hpux*) gl_cv_func_printf_infinite_long_double="guessing yes";; +changequote([,])dnl + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_printf_infinite_long_double="guessing yes"], + [gl_cv_func_printf_infinite_long_double="guessing no"]) + ;; # If we don't know, assume the worst. *) gl_cv_func_printf_infinite_long_double="guessing no";; esac ;; esac -changequote([,])dnl ]) ]) ;; @@ -489,8 +520,15 @@ int main () && strcmp (buf, "0x6.0ap-2 33") != 0 && strcmp (buf, "0xc.14p-3 33") != 0)) result |= 4; + /* This catches a Mac OS X 10.12.4 (Darwin 16.5) bug: it doesn't round. */ + if (sprintf (buf, "%.0a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x2p+0 33") != 0 + && strcmp (buf, "0x3p-1 33") != 0 + && strcmp (buf, "0x6p-2 33") != 0 + && strcmp (buf, "0xcp-3 33") != 0)) + result |= 4; /* This catches a FreeBSD 6.1 bug. See - */ + */ if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 || buf[0] == '0') result |= 8; @@ -502,7 +540,7 @@ int main () && strcmp (buf, "0x8.0p-2") != 0)) result |= 16; /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a - glibc 2.4 bug . */ + glibc 2.4 bug . */ if (sprintf (buf, "%.1La", 1.999L) < 0 || (strcmp (buf, "0x1.0p+1") != 0 && strcmp (buf, "0x2.0p+0") != 0 @@ -516,7 +554,7 @@ int main () [ case "$host_os" in # Guess yes on glibc >= 2.5 systems. - *-gnu*) + *-gnu* | gnu*) AC_EGREP_CPP([BZ2908], [ #include #ifdef __GNU_LIBRARY__ @@ -528,6 +566,8 @@ int main () [gl_cv_func_printf_directive_a="guessing yes"], [gl_cv_func_printf_directive_a="guessing no"]) ;; + # Guess no on native Windows. + mingw*) gl_cv_func_printf_directive_a="guessing no";; # If we don't know, assume the worst. *) gl_cv_func_printf_directive_a="guessing no";; esac @@ -570,10 +610,10 @@ int main () [gl_cv_func_printf_directive_f=yes], [gl_cv_func_printf_directive_f=no], [ -changequote(,)dnl case "$host_os" in +changequote(,)dnl # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_directive_f="guessing yes";; + *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; @@ -581,12 +621,21 @@ changequote(,)dnl darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; darwin*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on Solaris >= 2.10. - solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";; - solaris*) gl_cv_func_printf_sizes_c99="guessing no";; + solaris2.[1-9][0-9]*) gl_cv_func_printf_directive_f="guessing yes";; + solaris*) gl_cv_func_printf_directive_f="guessing no";; +changequote([,])dnl + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_printf_directive_f="guessing yes"], + [gl_cv_func_printf_directive_f="guessing no"]) + ;; # If we don't know, assume the worst. *) gl_cv_func_printf_directive_f="guessing no";; esac -changequote([,])dnl ]) ]) ]) @@ -638,13 +687,11 @@ int main () }]])], [gl_cv_func_printf_directive_n=yes], [gl_cv_func_printf_directive_n=no], - [ -changequote(,)dnl - case "$host_os" in + [case "$host_os" in + # Guess no on native Windows. mingw*) gl_cv_func_printf_directive_n="guessing no";; *) gl_cv_func_printf_directive_n="guessing yes";; esac -changequote([,])dnl ]) ]) ]) @@ -719,12 +766,14 @@ int main () [ changequote(,)dnl case "$host_os" in - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; - cygwin*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - *) gl_cv_func_printf_directive_ls="guessing yes";; + openbsd*) gl_cv_func_printf_directive_ls="guessing no";; + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess yes on native Windows. + mingw*) gl_cv_func_printf_directive_ls="guessing yes";; + *) gl_cv_func_printf_directive_ls="guessing yes";; esac changequote([,])dnl ]) @@ -763,6 +812,7 @@ changequote(,)dnl netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) gl_cv_func_printf_positions="guessing no";; beos*) gl_cv_func_printf_positions="guessing no";; + # Guess no on native Windows. mingw* | pw*) gl_cv_func_printf_positions="guessing no";; *) gl_cv_func_printf_positions="guessing yes";; esac @@ -801,6 +851,7 @@ changequote(,)dnl case "$host_os" in cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on native Windows. mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; *) gl_cv_func_printf_flag_grouping="guessing yes";; esac @@ -811,7 +862,7 @@ changequote([,])dnl dnl Test whether the *printf family of functions supports the - flag correctly. dnl (ISO C99.) See -dnl +dnl dnl Result is gl_cv_func_printf_flag_leftadjust. AC_DEFUN([gl_PRINTF_FLAG_LEFTADJUST], @@ -843,6 +894,8 @@ changequote(,)dnl hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";; # Guess no on HP-UX 10 and older. hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";; + # Guess yes on native Windows. + mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";; # Guess yes otherwise. *) gl_cv_func_printf_flag_leftadjust="guessing yes";; esac @@ -853,7 +906,7 @@ changequote([,])dnl dnl Test whether the *printf family of functions supports padding of non-finite dnl values with the 0 flag correctly. (ISO C99 + TC1 + TC2.) See -dnl +dnl dnl Result is gl_cv_func_printf_flag_zero. AC_DEFUN([gl_PRINTF_FLAG_ZERO], @@ -882,12 +935,14 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_flag_zero="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_printf_flag_zero="guessing no";; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess no on native Windows. + mingw*) gl_cv_func_printf_flag_zero="guessing no";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_flag_zero="guessing no";; esac changequote([,])dnl ]) @@ -1040,28 +1095,28 @@ changequote([,])dnl if test "$gl_cv_func_printf_enomem" = "guessing no"; then changequote(,)dnl case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_enomem="guessing yes";; - # Guess yes on Solaris. - solaris*) gl_cv_func_printf_enomem="guessing yes";; - # Guess yes on AIX. - aix*) gl_cv_func_printf_enomem="guessing yes";; - # Guess yes on HP-UX/hppa. - hpux*) case "$host_cpu" in - hppa*) gl_cv_func_printf_enomem="guessing yes";; - *) gl_cv_func_printf_enomem="guessing no";; - esac - ;; - # Guess yes on IRIX. - irix*) gl_cv_func_printf_enomem="guessing yes";; - # Guess yes on OSF/1. - osf*) gl_cv_func_printf_enomem="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_enomem="guessing yes";; - # 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";; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on Solaris. + solaris*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on AIX. + aix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on HP-UX/hppa. + hpux*) case "$host_cpu" in + hppa*) gl_cv_func_printf_enomem="guessing yes";; + *) gl_cv_func_printf_enomem="guessing no";; + esac + ;; + # Guess yes on IRIX. + irix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on OSF/1. + osf*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_enomem="guessing yes";; + # 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 changequote([,])dnl fi @@ -1121,7 +1176,7 @@ int main () changequote(,)dnl case "$host_os" in # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; @@ -1153,6 +1208,8 @@ changequote(,)dnl netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess no on native Windows. + mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";; # If we don't know, assume the worst. *) gl_cv_func_snprintf_truncation_c99="guessing no";; esac @@ -1216,11 +1273,10 @@ int main () }]])], [gl_cv_func_snprintf_retval_c99=yes], [gl_cv_func_snprintf_retval_c99=no], - [ + [case "$host_os" in changequote(,)dnl - case "$host_os" in # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; @@ -1243,10 +1299,19 @@ changequote(,)dnl netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; +changequote([,])dnl + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ +#ifdef _MSC_VER + Known +#endif + ], + [gl_cv_func_snprintf_retval_c99="guessing yes"], + [gl_cv_func_snprintf_retval_c99="guessing no"]) + ;; # If we don't know, assume the worst. *) gl_cv_func_snprintf_retval_c99="guessing no";; esac -changequote([,])dnl ]) ]) ]) @@ -1301,7 +1366,7 @@ int main () changequote(,)dnl case "$host_os" in # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; + *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; @@ -1326,6 +1391,8 @@ changequote(,)dnl netbsd*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess no on native Windows. + mingw*) gl_cv_func_snprintf_directive_n="guessing no";; # If we don't know, assume the worst. *) gl_cv_func_snprintf_directive_n="guessing no";; esac @@ -1342,6 +1409,7 @@ dnl Result is gl_cv_func_snprintf_size1. AC_DEFUN([gl_SNPRINTF_SIZE1], [ AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_SNPRINTF_PRESENCE]) AC_CACHE_CHECK([whether snprintf respects a size of 1], [gl_cv_func_snprintf_size1], @@ -1371,7 +1439,12 @@ int main() }]])], [gl_cv_func_snprintf_size1=yes], [gl_cv_func_snprintf_size1=no], - [gl_cv_func_snprintf_size1="guessing yes"]) + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_snprintf_size1="guessing yes" ;; + *) gl_cv_func_snprintf_size1="guessing yes" ;; + esac + ]) ]) ]) @@ -1443,7 +1516,7 @@ int main() changequote(,)dnl case "$host_os" in # Guess yes on glibc systems. - *-gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; @@ -1467,7 +1540,7 @@ changequote(,)dnl netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on mingw. + # Guess yes on native Windows. mingw* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # If we don't know, assume the worst. *) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; @@ -1533,7 +1606,8 @@ dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . # . dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . . dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . . dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . . -dnl Solaris 11 2011-11 . . # # # . . # . . . # . . . . . . . . +dnl Solaris 11.3 . . . . # . . # . . . . . . . . . . . . +dnl Solaris 11.0 . . # # # . . # . . . # . . . . . . . . dnl Solaris 10 . . # # # . . # . . . # # . . . . . . . dnl Solaris 2.6 ... 9 # . # # # # . # . . . # # . . . # . . . dnl Solaris 2.5.1 # . # # # # . # . . . # . . # # # # # # diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4 index da69865..9c1d5d0 100644 --- a/m4/pthread_rwlock_rdlock.m4 +++ b/m4/pthread_rwlock_rdlock.m4 @@ -1,5 +1,5 @@ # pthread_rwlock_rdlock.m4 serial 1 -dnl Copyright (C) 2017 Free Software Foundation, Inc. +dnl Copyright (C) 2017-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/quote.m4 b/m4/quote.m4 index 92be1e7..4d2198b 100644 --- a/m4/quote.m4 +++ b/m4/quote.m4 @@ -1,5 +1,5 @@ # quote.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index 5fae4f3..c639e6f 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/raise.m4 b/m4/raise.m4 index 28c2e0b..761e4b9 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ -# raise.m4 serial 3 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +# raise.m4 serial 4 +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,16 @@ AC_DEFUN([gl_FUNC_RAISE], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_MSVC_INVAL]) AC_CHECK_FUNCS([raise]) if test $ac_cv_func_raise = no; then HAVE_RAISE=0 else - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_RAISE=1 - fi + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_RAISE=1 + fi + ]) m4_ifdef([gl_SIGNALBLOCKING], [ gl_SIGNALBLOCKING if test $HAVE_POSIX_SIGNALBLOCKING = 0; then diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index f800ed4..b7497b8 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 2 -dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index 61ff098..055d71b 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 66 +# serial 67 -# Copyright (C) 1996-2001, 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,6 +13,7 @@ AC_PREREQ([2.50]) AC_DEFUN([gl_REGEX], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_ARG_WITH([included-regex], [AS_HELP_STRING([--without-included-regex], [don't compile regex; this is the default on systems @@ -75,7 +76,7 @@ AC_DEFUN([gl_REGEX], if (setlocale (LC_ALL, "en_US.UTF-8")) { { - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + /* https://sourceware.org/ml/libc-hacker/2006-09/msg00008.html This test needs valgrind to catch the bug on Debian GNU/Linux 3.1 x86, but it might catch the bug better on other platforms and it shouldn't hurt to try the @@ -99,7 +100,7 @@ AC_DEFUN([gl_REGEX], { /* This test is from glibc bug 15078. The test case is from Andreas Schwab in - . + . */ static char const pat[] = "[^x]x"; static char const data[] = @@ -197,7 +198,7 @@ AC_DEFUN([gl_REGEX], result |= 16; /* Catch a bug reported by Vin Shelton in - http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html + https://lists.gnu.org/r/bug-coreutils/2007-06/msg00089.html */ re_set_syntax (RE_SYNTAX_POSIX_BASIC & ~RE_CONTEXT_INVALID_DUP @@ -226,13 +227,19 @@ AC_DEFUN([gl_REGEX], return result; ]])], - [gl_cv_func_re_compile_pattern_working=yes], - [gl_cv_func_re_compile_pattern_working=no], - dnl When crosscompiling, assume it is not working. - [gl_cv_func_re_compile_pattern_working=no])]) - case $gl_cv_func_re_compile_pattern_working in #( - yes) ac_use_included_regex=no;; #( - no) ac_use_included_regex=yes;; + [gl_cv_func_re_compile_pattern_working=yes], + [gl_cv_func_re_compile_pattern_working=no], + [case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise, assume it is not working. + *) gl_cv_func_re_compile_pattern_working="guessing no" ;; + esac + ]) + ]) + case "$gl_cv_func_re_compile_pattern_working" in #( + *yes) ac_use_included_regex=no;; #( + *no) ac_use_included_regex=yes;; esac ;; *) AC_MSG_ERROR([Invalid value for --with-included-regex: $with_included_regex]) diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index fd60a40..269e331 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ -# sched_h.m4 serial 9 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# sched_h.m4 serial 11 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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 Written by Bruno Haible. AC_DEFUN([gl_SCHED_H], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_HEADERS_ONCE([sys/cdefs.h]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ @@ -41,10 +42,21 @@ AC_DEFUN([gl_SCHED_H], #include ]]) else - dnl On OS/2 kLIBC, struct sched_param is in spawn.h. - AC_CHECK_TYPE([struct sched_param], - [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], - [#include ]) + HAVE_STRUCT_SCHED_PARAM=0 + case "$host_os" in + os2*) + dnl On OS/2 kLIBC, struct sched_param is in spawn.h. + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [], + [#include ]) + ;; + vms) + dnl On OpenVMS 7.2 or newer, struct sched_param is in pthread.h. + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [], + [#include ]) + ;; + esac fi AC_SUBST([HAVE_STRUCT_SCHED_PARAM]) diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4 index 6bd4afd..ad78eb1 100644 --- a/m4/secure_getenv.m4 +++ b/m4/secure_getenv.m4 @@ -1,5 +1,5 @@ # Look up an environment variable more securely. -dnl Copyright 2013-2017 Free Software Foundation, Inc. +dnl Copyright 2013-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/select.m4 b/m4/select.m4 index c7844bc..db58037 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ -# select.m4 serial 8 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +# select.m4 serial 9 +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -74,10 +74,10 @@ changequote([,])dnl [gl_cv_func_select_detects_ebadf=no], [ case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_select_detects_ebadf="guessing no" ;; esac ]) ]) diff --git a/m4/servent.m4 b/m4/servent.m4 index 89331e2..5a1c4c6 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,5 +1,5 @@ # servent.m4 serial 2 -dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha1.m4 b/m4/sha1.m4 index 864a531..99006f7 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,5 +1,5 @@ # sha1.m4 serial 12 -dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 0ebbdf0..cdc656a 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,5 +1,5 @@ # sha256.m4 serial 8 -dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha512.m4 b/m4/sha512.m4 index b9db2fe..ac5257c 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,5 +1,5 @@ # sha512.m4 serial 9 -dnl Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4 index 004edc6..2ff5049 100644 --- a/m4/sig_atomic_t.m4 +++ b/m4/sig_atomic_t.m4 @@ -1,5 +1,5 @@ # sig_atomic_t.m4 serial 3 -dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigaction.m4 b/m4/sigaction.m4 index 1042f3a..f6918fa 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ # sigaction.m4 serial 7 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index eaf5ce9..394b91d 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 18 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index 26041b1..4350b21 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ # signalblocking.m4 serial 14 -dnl Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigpipe.m4 b/m4/sigpipe.m4 index 490058c..4c86bb2 100644 --- a/m4/sigpipe.m4 +++ b/m4/sigpipe.m4 @@ -1,5 +1,5 @@ # sigpipe.m4 serial 2 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 05ad1b6..2b770e6 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 10 -dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index e5155f7..decc8e5 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 7 -dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index c708fd2..ca240b1 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ # socketlib.m4 serial 1 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockets.m4 b/m4/sockets.m4 index 0ef23bc..d941dad 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 0a62f49..f2d996d 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index c2e2582..e3fe2c4 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 8 -dnl Copyright (C) 2004, 2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/spawn-pipe.m4 b/m4/spawn-pipe.m4 index ae53037..ed4d66d 100644 --- a/m4/spawn-pipe.m4 +++ b/m4/spawn-pipe.m4 @@ -1,5 +1,5 @@ # spawn-pipe.m4 serial 2 -dnl Copyright (C) 2004, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index 0003f2d..6cbdc4c 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -1,5 +1,5 @@ # spawn_h.m4 serial 16 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 66ba9d4..0977f20 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 4017fc9..d0d17ed 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2018 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/stat.m4 b/m4/stat.m4 index 9ff77df..d762cba 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ -# serial 11 +# serial 14 -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8,64 +8,65 @@ AC_DEFUN([gl_FUNC_STAT], [ - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([lstat]) - dnl mingw is the only known platform where stat(".") and stat("./") differ - AC_CACHE_CHECK([whether stat handles trailing slashes on directories], - [gl_cv_func_stat_dir_slash], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include -]], [[struct stat st; return stat (".", &st) != stat ("./", &st);]])], - [gl_cv_func_stat_dir_slash=yes], [gl_cv_func_stat_dir_slash=no], - [case $host_os in - mingw*) gl_cv_func_stat_dir_slash="guessing no";; - *) gl_cv_func_stat_dir_slash="guessing yes";; - esac])]) - dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). - dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) - dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). - AC_CACHE_CHECK([whether stat handles trailing slashes on files], - [gl_cv_func_stat_file_slash], - [touch conftest.tmp - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - ln -s conftest.tmp conftest.lnk - fi - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include + case "$host_os" in + mingw*) + dnl On this platform, the original stat() returns st_atime, st_mtime, + dnl st_ctime values that are affected by the time zone. + REPLACE_STAT=1 + ;; + *) + dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). + dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) + dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). + AC_CACHE_CHECK([whether stat handles trailing slashes on files], + [gl_cv_func_stat_file_slash], + [touch conftest.tmp + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + ln -s conftest.tmp conftest.lnk + fi + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], [[int result = 0; - struct stat st; - if (!stat ("conftest.tmp/", &st)) - result |= 1; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) - result |= 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif - return result; - ]])], - [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; - esac - ]) - rm -f conftest.tmp conftest.lnk]) - case $gl_cv_func_stat_dir_slash in - *no) REPLACE_STAT=1 - AC_DEFINE([REPLACE_FUNC_STAT_DIR], [1], [Define to 1 if stat needs - help when passed a directory name with a trailing slash]);; - esac - case $gl_cv_func_stat_file_slash in - *no) REPLACE_STAT=1 - AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs - help when passed a file name with a trailing slash]);; + return result; + ]])], + [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_stat_file_slash="guessing no" ;; + esac + ]) + rm -f conftest.tmp conftest.lnk]) + case $gl_cv_func_stat_file_slash in + *no) + REPLACE_STAT=1 + AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs + help when passed a file name with a trailing slash]);; + esac + case $host_os in + dnl Solaris stat can return a negative tv_nsec. + solaris*) + REPLACE_FSTAT=1 ;; + esac + ;; esac ]) -# Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], [:]) +# Prerequisites of lib/stat.c and lib/stat-w32.c. +AC_DEFUN([gl_PREREQ_STAT], [ + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + : +]) diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 3a12658..c74fe9b 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2017 Free Software Foundation, Inc. +dnl Copyright 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,7 +18,7 @@ AC_DEFUN([gl_STDALIGN_H], /* Test that alignof yields a result consistent with offsetof. This catches GCC bug 52023 - . */ + . */ #ifdef __cplusplus template struct alignof_helper { char a; t b; }; # define ao(type) offsetof (alignof_helper, b) @@ -35,8 +35,8 @@ AC_DEFUN([gl_STDALIGN_H], || (defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ - || __ICC || 0x5110 <= __SUNPRO_C \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index d368123..f8c0577 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -87,8 +87,8 @@ AC_DEFUN([AC_CHECK_HEADER_STDBOOL], char o[sizeof n == m * sizeof n[0] ? 1 : -1]; char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html */ Bool q = true; Bool *pq = &q; diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index f45def1..ba3d201 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for , for platforms that have issues. # stddef_h.m4 serial 5 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 4ac854d..b86184c 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 50 -dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. +# stdint.m4 serial 51 +dnl Copyright (C) 2001-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,6 +10,7 @@ dnl Test whether is supported or must be substituted. AC_DEFUN_ONCE([gl_STDINT_H], [ AC_PREREQ([2.59])dnl + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_LIMITS_H]) AC_REQUIRE([gt_TYPE_WINT_T]) @@ -288,8 +289,12 @@ static const char *macro_values[] = ]])], [gl_cv_header_working_stdint_h=yes], [], - [dnl When cross-compiling, assume it works. - gl_cv_header_working_stdint_h=yes + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; + esac ]) ]) ]) @@ -299,15 +304,16 @@ static const char *macro_values[] = HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then - HAVE_C99_STDINT_H=1 - dnl Now see whether the system works without - dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. - AC_CACHE_CHECK([whether stdint.h predates C++11], - [gl_cv_header_stdint_predates_cxx11_h], - [gl_cv_header_stdint_predates_cxx11_h=yes - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ + case "$gl_cv_header_working_stdint_h" in + *yes) + HAVE_C99_STDINT_H=1 + dnl Now see whether the system works without + dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. + AC_CACHE_CHECK([whether stdint.h predates C++11], + [gl_cv_header_stdint_predates_cxx11_h], + [gl_cv_header_stdint_predates_cxx11_h=yes + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ #include ] @@ -315,45 +321,47 @@ gl_STDINT_INCLUDES [ intmax_t im = INTMAX_MAX; int32_t i32 = INT32_C (0x7fffffff); - ]])], - [gl_cv_header_stdint_predates_cxx11_h=no])]) + ]])], + [gl_cv_header_stdint_predates_cxx11_h=no])]) - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then - AC_DEFINE([__STDC_CONSTANT_MACROS], [1], - [Define to 1 if the system predates C++11.]) - AC_DEFINE([__STDC_LIMIT_MACROS], [1], - [Define to 1 if the system predates C++11.]) - fi - AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], - [gl_cv_header_stdint_width], - [gl_cv_header_stdint_width=no - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ - /* Work if build is not clean. */ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 - #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include - ]gl_STDINT_INCLUDES[ - int iw = UINTMAX_WIDTH; - ]])], - [gl_cv_header_stdint_width=yes])]) - if test "$gl_cv_header_stdint_width" = yes; then - STDINT_H= - fi - else - dnl Check for , and for - dnl (used in Linux libc4 >= 4.6.7 and libc5). - AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - fi - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - fi - gl_STDINT_TYPE_PROPERTIES - fi + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + AC_DEFINE([__STDC_CONSTANT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + AC_DEFINE([__STDC_LIMIT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + fi + AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], + [gl_cv_header_stdint_width], + [gl_cv_header_stdint_width=no + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include + ]gl_STDINT_INCLUDES[ + int iw = UINTMAX_WIDTH; + ]])], + [gl_cv_header_stdint_width=yes])]) + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi + ;; + *) + dnl Check for , and for + dnl (used in Linux libc4 >= 4.6.7 and libc5). + AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + fi + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + fi + gl_STDINT_TYPE_PROPERTIES + ;; + esac dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. LIMITS_H=limits.h diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 786eaa3..2d2a33c 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 9ffbb85..e06461e 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ # stdio_h.m4 serial 48 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 110fe2d..eff6f9e 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 43 -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +# stdlib_h.m4 serial 44 +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 +21,9 @@ AC_DEFUN([gl_STDLIB_H], #endif ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps - posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch - secure_getenv setenv setstate setstate_r srandom srandom_r - strtod strtoll strtoull unlockpt unsetenv]) + posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray + realpath rpmatch secure_getenv setenv setstate setstate_r srandom + srandom_r strtod strtoll strtoull unlockpt unsetenv]) ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], @@ -58,6 +58,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) @@ -77,6 +78,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) + HAVE_DECL_INITSTATE=1; AC_SUBST([HAVE_DECL_INITSTATE]) HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP]) HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS]) @@ -89,11 +91,13 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) + HAVE_REALLOCARRAY=1; AC_SUBST([HAVE_REALLOCARRAY]) HAVE_REALPATH=1; AC_SUBST([HAVE_REALPATH]) HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH]) HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV]) HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV]) + HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE]) HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) diff --git a/m4/strcase.m4 b/m4/strcase.m4 index de20eb6..3444fda 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ # strcase.m4 serial 11 -dnl Copyright (C) 2002, 2005-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 320d5fb..689f128 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ # strchrnul.m4 serial 9 -dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strdup.m4 b/m4/strdup.m4 index a92dbd6..dddaa01 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 13 -dnl Copyright (C) 2002-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 460ddc9..b886b8d 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 17 -dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. +# strerror.m4 serial 19 +dnl Copyright (C) 2002, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,10 +24,10 @@ AC_DEFUN([gl_FUNC_STRERROR], [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_working_strerror="guessing no" ;; esac ]) ]) @@ -78,10 +78,12 @@ AC_DEFUN([gl_FUNC_STRERROR_0], [gl_cv_func_strerror_0_works=yes], [gl_cv_func_strerror_0_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_strerror_0_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_strerror_0_works="guessing no" ;; esac ]) ]) diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index 1e3e7a7..a3e3a4c 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ -# strerror_r.m4 serial 18 -dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. +# strerror_r.m4 serial 19 +dnl Copyright (C) 2002, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_STRERROR_R], dnl Some systems don't declare strerror_r() if _THREAD_SAFE and _REENTRANT dnl are not defined. - AC_CHECK_DECL([strerror_r], - [HAVE_DECL_STRERROR_R=1], [HAVE_DECL_STRERROR_R=0]) - AC_DEFINE_UNQUOTED([HAVE_DECL_STRERROR_R_ORIG], [$HAVE_DECL_STRERROR_R], - [Define to 1 if you have the declaration of 'strerror_r' in the system include files, or to 0 otherwise.]) + AC_CHECK_DECLS_ONCE([strerror_r]) + if test $ac_cv_have_decl_strerror_r = no; then + HAVE_DECL_STRERROR_R=0 + fi if test $ac_cv_func_strerror_r = yes; then if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then @@ -36,20 +36,6 @@ AC_DEFUN([gl_FUNC_STRERROR_R], REPLACE_STRERROR_R=1 fi fi - - # Overwrite the findings of AC_FUNC_STRERROR_R (for code that uses that). - AC_REQUIRE([AC_FUNC_STRERROR_R]) -]) - -# If this module is in use, we unconditionally want POSIX semantics; so -# replace autoconf's macro with a version that does not probe -AC_DEFUN([AC_FUNC_STRERROR_R], [ - AC_DEFINE([HAVE_DECL_STRERROR_R], [1], - [Define to 1, since you should have the declaration of strerror_r.]) - AC_DEFINE([HAVE_STRERROR_R], [1], - [Define to 1, since you should have the function strerror_r.]) - AC_DEFINE([STRERROR_R_CHAR_P], [0], - [Define to 0, since strerror_r should not return char *.]) ]) # Prerequisites of lib/strerror_r.c. @@ -68,7 +54,7 @@ AC_DEFUN([gl_FUNC_STRERROR_R_WORKS], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_FUNC_STRERROR_0]) - AC_CHECK_FUNC([strerror_r]) + AC_CHECK_FUNCS_ONCE([strerror_r]) if test $ac_cv_func_strerror_r = yes; then if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then dnl The POSIX prototype is: int strerror_r (int, char *, size_t); diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 3d2ad22..97c80dc 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2017 Free Software Foundation, Inc. +# Copyright (C) 2007-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 21 +# serial 22 # Written by Paul Eggert. @@ -43,6 +43,7 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR], AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], [ + GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) @@ -82,6 +83,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR]) @@ -105,16 +107,16 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) + REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) + REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT]) + REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) + REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN]) REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) - REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) + REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) - REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT]) - REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) - REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) - REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) ]) diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 index 1163a63..9dcb830 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 6 -# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 7a28f21..07ac886 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 22 -dnl Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index bf05027..856747c 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 13 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index b2a6eb8..fd22c58 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,5 +1,5 @@ # strpbrk.m4 serial 6 -dnl Copyright (C) 2002-2003, 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strptime.m4 b/m4/strptime.m4 index 91ce498..51668c8 100644 --- a/m4/strptime.m4 +++ b/m4/strptime.m4 @@ -1,5 +1,5 @@ # strptime.m4 serial 7 -dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index cb551cc..b777089 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,5 +1,5 @@ -# strtok_r.m4 serial 13 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, +# strtok_r.m4 serial 15 +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_STRTOK_R], dnl when the second argument to strtok_r is a constant string that has dnl exactly one byte and compiling with optimization. This bug is, for dnl example, present in the glibc 2.7-18 package in Debian "lenny". - dnl See . + dnl See . AC_CACHE_CHECK([whether strtok_r works], [gl_cv_func_strtok_r_works], [AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -41,14 +41,13 @@ AC_DEFUN([gl_FUNC_STRTOK_R], ], [gl_cv_func_strtok_r_works=yes], [gl_cv_func_strtok_r_works=no], - [ -changequote(,)dnl - case "$host_os" in - # Guess no on glibc systems. - *-gnu*) gl_cv_func_strtok_r_works="guessing no";; - *) gl_cv_func_strtok_r_works="guessing yes";; + [case "$host_os" in + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtok_r_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strtok_r_works="guessing yes" ;; + *) gl_cv_func_strtok_r_works="guessing yes" ;; esac -changequote([,])dnl ]) ]) case "$gl_cv_func_strtok_r_works" in diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index 9c2a903..5f34852 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ # strtoll.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 220ea19..a452f7c 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ -# serial 6 +# serial 7 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -36,10 +36,10 @@ AC_DEFUN([gl_FUNC_SYMLINK], ]])], [gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_symlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_symlink_works="guessing no" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_symlink_works="guessing no" ;; esac ]) rm -f conftest.f conftest.link conftest.lnk2]) diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 index 6317572..e8d7389 100644 --- a/m4/sys_file_h.m4 +++ b/m4/sys_file_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 6 -# Copyright (C) 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index e68f9cd..1ef67c0 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -1,5 +1,5 @@ # sys_ioctl_h.m4 serial 10 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 4ec2800..8e9eff4 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ # sys_select_h.m4 serial 20 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 3ecbe7c..f210378 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 23 -dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 1e34ac4..52f06aa 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 28 -*- Autoconf -*- -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 31 -*- Autoconf -*- +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,18 +19,21 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], dnl Ensure the type mode_t gets defined. AC_REQUIRE([AC_TYPE_MODE_T]) - dnl Whether to override 'struct stat'. + dnl Whether to enable precise timestamps in 'struct stat'. + m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [ + AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC]) + ], [ + WINDOWS_STAT_TIMESPEC=0 + ]) + AC_SUBST([WINDOWS_STAT_TIMESPEC]) + + dnl Whether to ensure that struct stat.st_size is 64-bit wide. m4_ifdef([gl_LARGEFILE], [ AC_REQUIRE([gl_LARGEFILE]) ], [ WINDOWS_64_BIT_ST_SIZE=0 ]) AC_SUBST([WINDOWS_64_BIT_ST_SIZE]) - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1], - [Define to 1 if Gnulib overrides 'struct stat' on Windows so that - struct stat.st_size becomes 64-bit.]) - fi dnl Define types that are supposed to be defined in or dnl . @@ -72,6 +75,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) + GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index e622dbe..d7e9268 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . -# serial 8 +# serial 9 -# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2018 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. @@ -105,7 +105,6 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) HAVE_SYS_TIME_H=1; AC_SUBST([HAVE_SYS_TIME_H]) - HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) REPLACE_GETTIMEOFDAY=0; AC_SUBST([REPLACE_GETTIMEOFDAY]) REPLACE_STRUCT_TIMEVAL=0; AC_SUBST([REPLACE_STRUCT_TIMEVAL]) ]) diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index 2eb4e9e..2debfb0 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,11 +1,14 @@ -# sys_types_h.m4 serial 6 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +# sys_types_h.m4 serial 9 +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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_ONCE([gl_SYS_TYPES_H], [ + dnl Use sane struct stat types in OpenVMS 8.2 and later. + AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) + AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) gl_NEXT_HEADERS([sys/types.h]) @@ -17,6 +20,14 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], dnl Whether to override the 'off_t' type. AC_REQUIRE([gl_TYPE_OFF_T]) + + dnl Whether to override the 'dev_t' and 'ino_t' types. + m4_ifdef([gl_WINDOWS_STAT_INODES], [ + AC_REQUIRE([gl_WINDOWS_STAT_INODES]) + ], [ + WINDOWS_STAT_INODES=0 + ]) + AC_SUBST([WINDOWS_STAT_INODES]) ]) AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], @@ -24,12 +35,12 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], ]) # This works around a buggy version in autoconf <= 2.69. -# See +# See m4_version_prereq([2.70], [], [ # This is taken from the following Autoconf patch: -# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98 +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974 m4_undefine([AC_HEADER_MAJOR]) AC_DEFUN([AC_HEADER_MAJOR], diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index 68ef088..2cd01e1 100644 --- a/m4/sys_uio_h.m4 +++ b/m4/sys_uio_h.m4 @@ -1,5 +1,5 @@ # sys_uio_h.m4 serial 1 -dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4 index ed0fe7f..25b3815 100644 --- a/m4/sys_wait_h.m4 +++ b/m4/sys_wait_h.m4 @@ -1,5 +1,5 @@ # sys_wait_h.m4 serial 6 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index a59f4c0..ed813f1 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index f79fde2..1f7b134 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 12 -dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. +# threadlib.m4 serial 13 +dnl Copyright (C) 2005-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ changequote(,)dnl dnl child process gets an endless segmentation fault inside execvp(). dnl Disable multithreading by default on Cygwin 1.5.x, because it has dnl bugs that lead to endless loops or crashes. See - dnl . + dnl . osf*) gl_use_threads=no ;; cygwin*) case `uname -r` in @@ -148,6 +148,10 @@ int main () [gl_cv_have_weak="guessing no"]) ]) fi + dnl But when linking statically, weak symbols don't work. + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac ]) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that @@ -165,7 +169,7 @@ int main () # # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: - # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html save_LIBS=$LIBS for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" diff --git a/m4/time_h.m4 b/m4/time_h.m4 index b925678..ad6f2f5 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc. -# serial 9 +# serial 11 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -104,24 +104,34 @@ AC_DEFUN([gl_TIME_MODULE_INDICATOR], AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], [ + GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) + GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) + GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) + GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) + HAVE_TZSET=1; AC_SUBST([HAVE_TZSET]) + dnl Even GNU libc does not have timezone_t yet. + HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) dnl If another module says to replace or to not replace, do that. dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK; dnl this lets maintainers check for portability. + REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME]) REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R]) REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) + REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) + REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) dnl Hack so that the time module doesn't depend on the sys_time module. dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 3e24ccb..daf4bba 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 510e25a..46f599c 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ -# timegm.m4 serial 11 -dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc. +# timegm.m4 serial 12 +dnl Copyright (C) 2003, 2007, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,11 +7,11 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_TIMEGM], [ AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MKTIME]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) REPLACE_TIMEGM=0 AC_CHECK_FUNCS_ONCE([timegm]) if test $ac_cv_func_timegm = yes; then - if test $gl_cv_func_working_mktime = no; then + if test "$gl_cv_func_working_mktime" != yes; then # Assume that timegm is buggy if mktime is. REPLACE_TIMEGM=1 fi diff --git a/m4/timespec.m4 b/m4/timespec.m4 index c901468..accabf9 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index 32db008..56c48a6 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tmpdir.m4 b/m4/tmpdir.m4 index 80476d2..ccfa72a 100644 --- a/m4/tmpdir.m4 +++ b/m4/tmpdir.m4 @@ -1,5 +1,5 @@ # tmpdir.m4 serial 4 -dnl Copyright (C) 2001-2002, 2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index 7a3e4c5..2027f77 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 25aef19..b3b71ec 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 69 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +# unistd_h.m4 serial 71 +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,8 +46,8 @@ AC_DEFUN([gl_UNISTD_H], gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite - readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r - unlink unlinkat usleep]) + readlink readlinkat rmdir sethostname sleep symlink symlinkat + truncate ttyname_r unlink unlinkat usleep]) ]) AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], @@ -102,6 +102,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) + GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) @@ -139,6 +140,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) + HAVE_TRUNCATE=1; AC_SUBST([HAVE_TRUNCATE]) HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) @@ -157,6 +159,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) + REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) @@ -179,6 +182,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) + REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index dee6c35..73172e8 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ -# unlink.m4 serial 11 -dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. +# unlink.m4 serial 12 +dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -45,6 +45,8 @@ AC_DEFUN([gl_FUNC_UNLINK], [case "$host_os" in # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; # If we don't know, assume the worst. *) gl_cv_func_unlink_honors_slashes="guessing no" ;; esac diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index 448ccac..7e46367 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 15 -# Copyright (C) 1998-2006, 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 deleted file mode 100644 index 1c42234..0000000 --- a/m4/utimbuf.m4 +++ /dev/null @@ -1,39 +0,0 @@ -# serial 9 - -# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2017 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -dnl From Jim Meyering - -dnl Define HAVE_STRUCT_UTIMBUF if 'struct utimbuf' is declared -- -dnl usually in . -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_CACHE_CHECK([for struct utimbuf], [gl_cv_sys_struct_utimbuf], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#if HAVE_SYS_TIME_H - #include - #endif - #include - #ifdef HAVE_UTIME_H - #include - #endif - ]], - [[static struct utimbuf x; x.actime = x.modtime;]])], - [gl_cv_sys_struct_utimbuf=yes], - [gl_cv_sys_struct_utimbuf=no])]) - - if test $gl_cv_sys_struct_utimbuf = yes; then - 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 new file mode 100644 index 0000000..a382aaa --- /dev/null +++ b/m4/utime.m4 @@ -0,0 +1,26 @@ +# utime.m4 serial 1 +dnl Copyright (C) 2017-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_UTIME], +[ + AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CHECK_FUNCS_ONCE([utime]) + if test $ac_cv_func_utime = no; then + HAVE_UTIME=0 + else + case "$host_os" in + mingw*) + dnl On this platform, the original utime() or _utime() produces + dnl timestamps that are affected by the time zone. + REPLACE_UTIME=1 + ;; + esac + fi +]) + +# Prerequisites of lib/utime.c. +AC_DEFUN([gl_PREREQ_UTIME], [:]) diff --git a/m4/utime_h.m4 b/m4/utime_h.m4 new file mode 100644 index 0000000..89e301b --- /dev/null +++ b/m4/utime_h.m4 @@ -0,0 +1,59 @@ +# utime_h.m4 serial 1 +dnl Copyright (C) 2017-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_UTIME_H], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + AC_CHECK_HEADERS_ONCE([utime.h]) + gl_CHECK_NEXT_HEADERS([utime.h]) + + if test $ac_cv_header_utime_h = yes; then + HAVE_UTIME_H=1 + else + HAVE_UTIME_H=0 + fi + AC_SUBST([HAVE_UTIME_H]) + + UTIME_H='' + if test $ac_cv_header_utime_h != yes; then + dnl Provide a substitute file. + UTIME_H=utime.h + else + case "$host_os" in + mingw*) dnl Need special handling of 'struct utimbuf'. + UTIME_H=utime.h + ;; + esac + fi + AC_SUBST([UTIME_H]) + AM_CONDITIONAL([GL_GENERATE_UTIME_H], [test -n "$UTIME_H"]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[#include + ]], + [utime]) +]) + +AC_DEFUN([gl_UTIME_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +AC_DEFUN([gl_UTIME_H_DEFAULTS], +[ + GNULIB_UTIME=0; AC_SUBST([GNULIB_UTIME]) + dnl Assume POSIX behavior unless another module says otherwise. + HAVE_UTIME=1; AC_SUBST([HAVE_UTIME]) + REPLACE_UTIME=0; AC_SUBST([REPLACE_UTIME]) +]) diff --git a/m4/utimens.m4 b/m4/utimens.m4 index c58e93c..16798a0 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,16 +1,15 @@ -dnl Copyright (C) 2003-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl serial 7 +dnl serial 8 AC_DEFUN([gl_UTIMENS], [ dnl Prerequisites of lib/utimens.c. AC_REQUIRE([gl_FUNC_UTIMES]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) - AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_FUNCS_ONCE([futimes futimesat futimens utimensat lutimes]) diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 518824f..f62d5f8 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,7 +1,7 @@ # Detect some bugs in glibc's implementation of utimes. -# serial 4 +# serial 5 -dnl Copyright (C) 2003-2005, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,10 +20,10 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_UTIMES], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether the utimes function works], [gl_cv_func_working_utimes], - [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #include @@ -142,9 +142,17 @@ main () ]])], [gl_cv_func_working_utimes=yes], [gl_cv_func_working_utimes=no], - [gl_cv_func_working_utimes=no])]) + [case "$host_os" in + # Guess no on native Windows. + mingw*) gl_cv_func_working_utimes="guessing no" ;; + *) gl_cv_func_working_utimes="guessing no" ;; + esac + ]) + ]) - if test $gl_cv_func_working_utimes = yes; then - AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly.]) - fi + case "$gl_cv_func_working_utimes" in + *yes) + AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly.]) + ;; + esac ]) diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 47c5951..b3fda27 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ # vasnprintf.m4 serial 36 -dnl Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index a75c6f1..0c00b4b 100644 --- a/m4/vasprintf.m4 +++ b/m4/vasprintf.m4 @@ -1,5 +1,5 @@ # vasprintf.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006-2007, 2009-2017 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4 index 9c37bca..1ebadda 100644 --- a/m4/vsnprintf.m4 +++ b/m4/vsnprintf.m4 @@ -1,5 +1,5 @@ # vsnprintf.m4 serial 7 -dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wait-process.m4 b/m4/wait-process.m4 index 8be8276..8daa1aa 100644 --- a/m4/wait-process.m4 +++ b/m4/wait-process.m4 @@ -1,5 +1,5 @@ # wait-process.m4 serial 6 -dnl Copyright (C) 2003, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/waitpid.m4 b/m4/waitpid.m4 index 4f1f6d3..a8c4002 100644 --- a/m4/waitpid.m4 +++ b/m4/waitpid.m4 @@ -1,5 +1,5 @@ # waitpid.m4 serial 2 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index 25ce737..e9c48bb 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ # warn-on-use.m4 serial 5 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index d0e11a0..416e0a1 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 40 +# wchar_h.m4 serial 42 AC_DEFUN([gl_WCHAR_H], [ @@ -35,6 +35,8 @@ AC_DEFUN([gl_WCHAR_H], fi AC_SUBST([HAVE_WINT_T]) + AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) + dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[ @@ -53,7 +55,7 @@ AC_DEFUN([gl_WCHAR_H], wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr - wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth + wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ]) ]) @@ -61,8 +63,8 @@ dnl Check whether is usable at all. AC_DEFUN([gl_WCHAR_H_INLINE_OK], [ dnl Test whether suffers due to the transition from '__inline' to - dnl 'gnu_inline'. See - dnl and . In summary, + dnl 'gnu_inline'. See + dnl and . In summary, dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and dnl the option -std=c99 or -std=gnu99, leads to a broken . AC_CACHE_CHECK([whether uses 'inline' correctly], @@ -120,7 +122,7 @@ This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in C99 mode. You have four options: - Add the flag -fgnu89-inline to CC and reconfigure, or - Fix your include files, using parts of - , or + , or - Use a gcc version older than 4.3, or - Don't use the flags -std=c99 or -std=gnu99. Configuration aborted.]) @@ -177,6 +179,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) + GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -215,6 +218,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) + HAVE_WCSFTIME=1; AC_SUBST([HAVE_WCSFTIME]) 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]) @@ -230,4 +234,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) + REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 11783d2..83bc3d5 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 0aa040d..c4e4463 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ -# wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# wcrtomb.m4 serial 12 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -51,6 +51,8 @@ changequote(,)dnl case "$host_os" in # Guess no on AIX 4, OSF/1 and Solaris. aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 45ddaeb..15d1ef3 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 18 +# wctype_h.m4 serial 21 dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,6 +30,8 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_WINT_T]) + AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) + gl_CHECK_NEXT_HEADERS([wctype.h]) if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then @@ -51,7 +53,8 @@ AC_DEFUN([gl_WCTYPE_H], int main () { return iswprint ('x') == 0; } ]])], [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + [dnl Guess no on Linux libc5, yes otherwise. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #if __GNU_LIBRARY__ == 1 Linux libc5 i18n is broken. #endif]], [])], diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 5871641..0605ce8 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 23 -dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. +# wcwidth.m4 serial 26 +dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,20 @@ AC_DEFUN([gl_FUNC_WCWIDTH], HAVE_DECL_WCWIDTH=0 fi - if test $ac_cv_func_wcwidth = yes; then + if test $ac_cv_func_wcwidth != yes; then + AC_CACHE_CHECK([whether wcwidth is a macro], + [gl_cv_func_wcwidth_macro], + [AC_EGREP_CPP([wchar_header_defines_wcwidth], [ +#include +#ifdef wcwidth + wchar_header_defines_wcwidth +#endif], + [gl_cv_func_wcwidth_macro=yes], + [gl_cv_func_wcwidth_macro=no]) + ]) + fi + + if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then HAVE_WCWIDTH=1 dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1. dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1. @@ -85,9 +98,9 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess yes on glibc and AIX 7 systems. - *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; - *) gl_cv_func_wcwidth_works="guessing no";; + # Guess yes on glibc and AIX 7 systems. + *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; + *) gl_cv_func_wcwidth_works="guessing no";; esac changequote([,])dnl ]) diff --git a/m4/wget.m4 b/m4/wget.m4 index d04f55a..1661ef0 100644 --- a/m4/wget.m4 +++ b/m4/wget.m4 @@ -1,7 +1,5 @@ dnl Wget-specific Autoconf macros. -dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -dnl Foundation, Inc. +dnl Copyright (C) 1995-2011, 2018 Free Software Foundation, Inc. dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 65e25a4..95f6854 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ -# wint_t.m4 serial 6 -dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. +# wint_t.m4 serial 7 +dnl Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -60,3 +60,15 @@ AC_DEFUN([gt_TYPE_WINT_T], fi AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ]) + +dnl Prerequisites of the 'wint_t' override. +AC_DEFUN([gl_TYPE_WINT_T_PREREQ], +[ + AC_CHECK_HEADERS_ONCE([crtdefs.h]) + if test $ac_cv_header_crtdefs_h = yes; then + HAVE_CRTDEFS_H=1 + else + HAVE_CRTDEFS_H=0 + fi + AC_SUBST([HAVE_CRTDEFS_H]) +]) diff --git a/m4/write.m4 b/m4/write.m4 index fd46acc..ecbdd22 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ -# write.m4 serial 5 -dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. +# write.m4 serial 6 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free 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,10 +7,12 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_WRITE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_WRITE=1 - fi + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_WRITE=1 + fi + ]) dnl This ifdef is just an optimization, to avoid performing a configure dnl check whose result is not used. It does not make the test of dnl GNULIB_UNISTD_H_SIGPIPE or GNULIB_SIGPIPE redundant. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index 53aba14..7bd360b 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index 5f85057..fc7c1ab 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index efb94a1..457bcc3 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/maint.mk b/maint.mk index 0cabd2f..be86fb5 100644 --- a/maint.mk +++ b/maint.mk @@ -2,7 +2,7 @@ # This Makefile fragment tries to be general-purpose enough to be # used by many projects via the gnulib maintainer-makefile module. -## Copyright (C) 2001-2017 Free Software Foundation, Inc. +## Copyright (C) 2001-2018 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## along with this program. If not, see . # This is reported not to work with make-3.79.1 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) @@ -130,8 +130,8 @@ gnu_ftp_host-stable = ftp.gnu.org gnu_rel_host ?= $(gnu_ftp_host-$(release-type)) url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \ - http://ftpmirror.gnu.org/$(PACKAGE), \ - ftp://$(gnu_rel_host)/gnu/$(PACKAGE)) + https://ftpmirror.gnu.org/$(PACKAGE), \ + https://$(gnu_rel_host)/gnu/$(PACKAGE)) # Override this in cfg.mk if you are using a different format in your # NEWS file. @@ -696,7 +696,7 @@ sc_prohibit_dirent_without_use: # Prohibit the inclusion of verify.h without an actual use. sc_prohibit_verify_without_use: @h='verify.h' \ - re='\<(verify(true|expr)?|static_assert) *\(' \ + re='\<(verify(true|expr)?|assume|static_assert) *\(' \ $(_sc_header_without_use) # Don't include xfreopen.h unless you use one of its functions. @@ -871,7 +871,7 @@ sc_GFDL_version: $(_sc_search_regexp) # Don't use Texinfo's @acronym{}. -# http://lists.gnu.org/archive/html/bug-gnulib/2010-03/msg00321.html +# https://lists.gnu.org/r/bug-gnulib/2010-03/msg00321.html texinfo_suffix_re_ ?= \.(txi|texi(nfo)?)$$ sc_texinfo_acronym: @prohibit='@acronym\{' \ @@ -1269,7 +1269,7 @@ sc_vulnerable_makefile_CVE-2009-4029: halt=$$(printf '%s\n' \ 'the above files are vulnerable; beware of running' \ ' "make dist*" rules, and upgrade to fixed automake' \ - ' see http://bugzilla.redhat.com/542609 for details') \ + ' see https://bugzilla.redhat.com/show_bug.cgi?id=542609 for details') \ $(_sc_search_regexp) sc_vulnerable_makefile_CVE-2012-3386: @@ -1278,7 +1278,7 @@ sc_vulnerable_makefile_CVE-2012-3386: halt=$$(printf '%s\n' \ 'the above files are vulnerable; beware of running' \ ' "make distcheck", and upgrade to fixed automake' \ - ' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \ + ' see https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-3386 for details') \ $(_sc_search_regexp) vc-diff-check: @@ -1353,8 +1353,8 @@ release-commit: ## Updating files. ## ## ---------------- ## -ftp-gnu = ftp://ftp.gnu.org/gnu -www-gnu = http://www.gnu.org +ftp-gnu = https://ftp.gnu.org/gnu +www-gnu = https://www.gnu.org upload_dest_dir_ ?= $(PACKAGE) upload_command = \ @@ -1535,7 +1535,7 @@ refresh-gnulib-patches: # Update gettext files. PACKAGE ?= $(shell basename $(PWD)) PO_DOMAIN ?= $(PACKAGE) -POURL = http://translationproject.org/latest/$(PO_DOMAIN)/ +POURL = https://translationproject.org/latest/$(PO_DOMAIN)/ PODIR ?= po refresh-po: rm -f $(PODIR)/*.po && \ diff --git a/po/POTFILES.in b/po/POTFILES.in index c7789cf..2b5a90b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,5 @@ # List of files which containing translatable strings. -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2011, 2018 Free Software Foundation, Inc. # Package source files lib/error.c diff --git a/po/be.gmo b/po/be.gmo index cf74b86..d8f6ab2 100644 Binary files a/po/be.gmo and b/po/be.gmo differ diff --git a/po/be.po b/po/be.po index fe8c736..a283748 100644 --- a/po/be.po +++ b/po/be.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.12-pre6\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2010-04-13 02:23+0300\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ ÑÑ–ÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" @@ -29,7 +29,7 @@ msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ ÑÑ–ÑÑ‚ÑÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" msgid "Address family for hostname not supported" msgstr "ÐдраÑÑ‹ IPv6 не падтрымліваюцца" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "ЧаÑÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° Ñž разьвÑзваньні назвы" @@ -100,70 +100,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%s\" зьÑўлÑецца неадназначнай\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%s\" зьÑўлÑецца неадназначнай\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\" не дазвалÑе довады\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: нераÑÐ¿Ð°Ð·Ð½Ð°Ð½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ \"%c%s\"\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%c%s\" не дазвалÑе довады\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%s\" патрабуе довад\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: нераÑÐ¿Ð°Ð·Ð½Ð°Ð½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\"\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: нераÑÐ¿Ð°Ð·Ð½Ð°Ð½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ \"%c%s\"\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: нерÑчаіÑÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ Ð¿Ð°Ñ‚Ñ€Ð°Ð±ÑƒÐµ аргумÑнт -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" зьÑўлÑецца неадназначнай\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" не дазвалÑе аргумÑнты\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%s\" патрабуе довад\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -183,13 +158,13 @@ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"%s\" патрабуе довад\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -265,28 +240,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -305,51 +280,51 @@ msgstr "" msgid "memory exhausted" msgstr "памÑць вычÑрпанаÑ" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: немагчыма вызначыць bind-Ð°Ð´Ñ€Ð°Ñ %s; bind адключаны.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "ДалучÑньне да %s[%s]:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "ДалучÑньне да %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "ДалучÑньне да %s:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "далучÑньне ÑžÑталÑвана.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "збой: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: немагчыма вызначыць назву вузла %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -383,176 +358,176 @@ msgstr "Ðемагчыма выдаліць %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ðемагчыма зрабіць запаÑную копію %s Ñк %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Ðемагчыма выдаліць %s: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "СінтакÑÑ–Ñ‡Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° Ñž Set-Cookie: %s на пазіцыі %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie з %s Ñпрабуе выÑтавіць дамÑн у %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ðемагчыма адкрыць файл з cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Памылка запіÑу Ñž %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Памылка Ð·Ð°ÐºÑ€Ñ‹Ñ†Ñ†Ñ %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "ГÑÑ‚Ñ‹ від ÑьпіÑа файлаў не падтрымліваецца, Ñпроба ўжыць разбор Unix-" "ÑьпіÑаў.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "ЗьмеÑÑ‚ /%s на %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Ñ‡Ð°Ñ Ð½ÐµÐ²Ñдомы " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Файл " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "ДырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Лучыва " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "ÐÑ Ð¿Ñўны " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s байтаў)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "ДаўжынÑ: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) заÑталоÑÑ" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s заÑталоÑÑ" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (неаўтарытÑтны)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Уваходжу Ñк %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Памылка Ñž адказе паÑлужніка; кантрольнае далучÑньне зачынена.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Памылка Ñž вітаньні ÑÑрвÑра.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Памылка запіÑу, закрыю кіроўнае злучÑньне.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "СÑрвÑÑ€ адмаўлÑе ва ўваходзе.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Уваход не карÑктны.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Увайшоў!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Памылка ÑÑрвÑра, немагчыма вызначыць тып ÑÑ‹ÑÑ‚Ñмы.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "зроблена." -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "зроблена.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "ÐевÑдомы тып `%c', закрыю кіроўнае злучÑньне.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "зроблена." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD непатрÑбнае.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -560,7 +535,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -569,38 +544,38 @@ msgstr "" "ÐдÑутнічае дырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD непатрÑбны.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "Файл %s ужо тут; абмінаем.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ðемагчыма ініцыÑлізаваць PASV-перадачу.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ðемагчыма зрабіць разбор PASV адказу.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "немагчыма далучыцца да %s, порт %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Памылка bind (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "КепÑкі загад PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -608,17 +583,17 @@ msgstr "" "\n" "Збой загаду REST; пачынаем уÑÑ‘ нанова.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Файл %s Ñ–Ñнуе.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "ÐдÑутнічае файл %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -627,7 +602,7 @@ msgstr "" "ÐдÑутнічае файл %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -636,40 +611,40 @@ msgstr "" "ÐдÑутнічае файл ці дырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s; закрыццё кіруючага далучÑннÑ.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - далучÑнне Ð´Ð»Ñ Ð´Ð°Ð½Ñ‹Ñ…: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Кантрольнае далучÑньне зачынена.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "ÐÐ±Ð°Ñ€Ð²Ð°Ð½Ð°Ñ Ð¿ÐµÑ€Ð°Ð´Ð°Ñ‡Ð° даньнÑÑž.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s ужо тут; абмінаем.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба: %2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -678,7 +653,7 @@ msgstr "" "%s (%s) - запіÑаны Ñž stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -687,42 +662,42 @@ msgstr "" "%s (%s) - %s захаваны [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Выдаленьне %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "ВыкарыÑтанне %s у ÑкаÑьці ліÑтынгу tmp-файла\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Выдалены %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "" "ЗначÑньне Ñ€ÑкурÑыўнае глыбіні %d большае за найбольшую дазволеную глыбіню " "%d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Ðддалены файл не навейшы за мÑÑцовы файл %s -- абмінаем.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "Ðддалены файл навейшы за мÑÑцовы файл %s -- выцÑгваем.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -731,11 +706,11 @@ msgstr "" "Памеры не Ñупадаюць (мÑÑцовы %s) -- выцÑгваецца.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "ÐерÑчаіÑÐ½Ð°Ñ Ð½Ð°Ð·Ð²Ð° ÑпаÑылкі; мінаецца.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -744,241 +719,241 @@ msgstr "" "Ужо маецца Ð¿Ñ€Ð°Ð²Ñ–Ð»ÑŒÐ½Ð°Ñ ÑпаÑылка %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "СтварÑньне ÑпаÑылкі %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Ð¡Ñ–Ð¼Ð²Ð°Ð»Ñ–Ñ‡Ð½Ñ‹Ñ ÑпаÑылкі не падтрымліваюцца; абмінаем symlink %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ðбмінаем дырÑкторыю %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: тып файла не падтрымліваецца або невÑдомы.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: пашкоджаны адбітак чаÑу.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "ÐдхілÑем %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Памылка ÑÑƒÐ¿Ð°Ð´Ð·ÐµÐ½ÑŒÐ½Ñ %s Ñупраць %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "ÐдÑутнічаюць Ñупадзенні з узорам %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ HTML-ізаваны індÑÐºÑ Ñƒ %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ HTML-ізаваны індÑÐºÑ Ñƒ %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, fuzzy, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" "ÐдÑутнічае дырÑÐºÑ‚Ð¾Ñ€Ñ‹Ñ %s.\n" "\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пытанні на .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ПÐМЫЛКÐ" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "УВÐГÐ" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "ПаÑведчанне Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Памылка разбору паÑведчаннÑ: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "ÐевÑдомы вузел" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Пошук %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "збой: адÑутнічае IPv4/IPv6 Ð°Ð´Ñ€Ð°Ñ Ð´Ð»Ñ Ð²ÑƒÐ·Ð»Ð°.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "збой: ÑкончыўÑÑ Ñ‡Ð°Ñ.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: немагчыма разьвÑзаць незавершаную ÑпаÑылку %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: нерÑчаіÑны URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Памылка запіÑу HTTP зварота: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "ÐдÑутнічаюць загалоўкі; верагодна, HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -987,133 +962,133 @@ msgstr "" "Файл %s ужо тут; абмінаем.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "ÐдÑутнічае файл %s з POST-данымі: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Паўторнае выкарыÑтаньне Ñ–Ñнуючага далучÑÐ½ÑŒÐ½Ñ Ð´Ð° %s:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Паўторнае выкарыÑтаньне Ñ–Ñнуючага далучÑÐ½ÑŒÐ½Ñ Ð´Ð° %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð°Ð´ÐºÐ°Ð·Ñƒ прокÑÑ–: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПÐМЫЛКР%d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ДрÑннаÑкладзены радок Ñтану" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Збой прокÑÑ–-тунÑлю: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ Ñхема аўтарызаваньнÑ.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "ÐевÑÐ´Ð¾Ð¼Ð°Ñ Ñхема аўтарызаваньнÑ.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Ð—Ð°Ð¿Ñ–Ñ Ñƒ %s.\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL адключаны з-за пералічаных памылак.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s зварот даÑланы, чакаецца адказ... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ð”Ð°Ð½Ñ‹Ñ Ð½Ðµ атрыманы.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ (%s) у загалоўках.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(апіÑаньне адÑутнічае)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Знаходжаньне: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "невÑдома" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [крочым]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1121,7 +1096,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1131,83 +1106,83 @@ msgstr "" " Файл ужо цалкам атрыманы; рабіць нічога Ð½Ñ Ñ‚Ñ€Ñба.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "ДаўжынÑ: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "праігнаравана" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Увага! Узоры не падтрымліваюцца Ñž HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Уключаны Ñ€Ñжым павука. Праверка наÑўнаÑьці аддаленага файла.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ðемагчыма ÑžÑталÑваць SSL злучÑньне.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðемагчыма запіÑаць у %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПÐМЫЛКÐ: перанакіраваньне (%d) без знаходжаньнÑ.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ðддалены файл не Ñ–Ñнуе -- Ð·Ð»Ð°Ð¼Ð°Ð½Ð°Ñ ÑпаÑылка!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Загаловак Last-Modified адÑутнічае -- адбіткі чаÑу адключаны.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Загаловак Last-Modified нерÑчаіÑны -- адбітак чаÑу будзе ігнаравацца.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1216,36 +1191,36 @@ msgstr "" "Ðддалены файл не навейшы за мÑÑцовы %s -- абмінаем.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Памеры не Ñупадаюць (мÑÑцовы %s) -- выцÑгваем.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Ðддалены файл навейшы, загружаю.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1253,12 +1228,12 @@ msgstr "" "Ðддалены файл Ñ–Ñнуе.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1267,7 +1242,7 @@ msgstr "" "%s (%s) - запіÑаны Ñž stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1276,58 +1251,58 @@ msgstr "" "%s (%s) - %s захаваны [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - злучÑньне закрыта на байце %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ð½Ð° байце %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Схема %s не падтрымліваецца" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ÑпаÑылаецца на %s, але ён(Ñна) адÑутнічае.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемагчыма прачытаць %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Памылка Ñž %s, радок %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: СінтакÑÑ–Ñ‡Ð°Ð½Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° Ñž %s, радок %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: невÑдомы загад %s у %s; радок %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1335,7 +1310,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1343,117 +1318,117 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: УВÐГÐ! СіÑÑ‚Ñмны Ñ– карыÑтальніцкі wgetrc ÑпаÑылаюцца на %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐÑдзейÑны загад --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: ÐÑдзейÑнае булева значÑнне %s; выкарыÑтоўвайце «on» ці «off».\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: ÐÑдзейÑнае булева значÑнне %s; выкарыÑтоўвайце «on» ці «off».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: ÐÑдзейÑны нумар %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: ÐÑдзейÑнае значÑнне байта %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: ÐÑдзейÑны адрÑзак чаÑу %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: ÐÑдзейÑнае значÑнне %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: ÐÑдзейÑны загаловак %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: ÐÑдзейÑны загаловак %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: ÐÑдзейÑны тып прагрÑÑбару %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Кадоўка %s не з'ÑўлÑецца дзейÑнай\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "КанверÑÑ–Ñ Ð· %s у %s непадтрымліваецца\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðеапрацаваны код памылкі %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: лакаль не вызначанаÑ\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "збой idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "немагчыма далучыцца да %s, порт %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1462,17 +1437,17 @@ msgstr "" "\n" "%s атрымана; перанакірванне вываду Ñž %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; Ð·Ð°Ð¿Ñ–Ñ Ñ…Ñ€Ð°Ð½Ð°Ð»Ð¾Ð³Ñ–Ñ– адключаны.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ВыкарыÑтанне: %s [OPTION]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1480,121 +1455,121 @@ msgstr "" "ÐргумÑнты, абавÑÐ·ÐºÐ¾ÑžÐ²Ñ‹Ñ Ð´Ð»Ñ Ð´Ð¾ÑžÐ³Ñ–Ñ… опцыÑÑž, абавÑÐ·ÐºÐ¾Ð²Ñ‹Ñ Ð¹ Ð´Ð»Ñ ÐºÐ°Ñ€Ð¾Ñ‚ÐºÑ–Ñ….\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version адлюÑтроўвае верÑÑ–ÑŽ Wget.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help друкую гÑтую даведку.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background Ñ„Ð¾Ð½Ð°Ð²Ð°Ñ Ð¿Ñ€Ð°Ñ†Ð° паÑÐ»Ñ Ð·Ð°Ð¿ÑƒÑку.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND выконвае загад у Ñтылі \".wgetrc\".\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Ð¥Ñ€Ð°Ð½Ð°Ð»Ð¾Ð³Ñ–Ñ Ñ– ÑžÐ²Ð°Ñ…Ð¾Ð´Ð½Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE запіÑваць паведамленні Ñž FILE.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE дадаць паведамленні Ñž FILE.\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose быць шматÑлоўным (прадвызначана).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -v, --verbose быць шматÑлоўным (прадвызначана).\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html лічыць уваходны файл за HTML.\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Запампоўка:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1603,17 +1578,17 @@ msgstr "" " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE запіÑвае дакумент у FILE.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1621,14 +1596,15 @@ msgid "" msgstr "" " -nc, --no-clobber абмінаць запампоўкі Ñ–Ñнуючых файлаў.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --spider не запампоўваць уÑÑ‘.\n" +msgstr "" +" -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1637,136 +1613,136 @@ msgstr "" " -c, --continue працÑг запампоўкі чаÑткова-атрыманага " "файла.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response друкаваць адказ ÑÑрвера.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE абмежаваць хуткаÑць запампоўкі ўзроўнем " "RATE.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1775,37 +1751,37 @@ msgstr "" " --ignore-case ігнараваць Ñ€ÑгіÑтар у назвах файлаў/" "дырÑкторыÑÑž.\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only далучацца толькі да IPv4 адраÑоў.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only далучацца толькі да IPv6 адраÑоў.\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1816,224 +1792,224 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "ДырÑкторыі:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Опцыі HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ігнараваць загаловак «Content-Length».\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2041,13 +2017,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2055,65 +2031,65 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Опцыі HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE файл ÑакрÑтнага ключа.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key=FILE файл ÑакрÑтнага ключа.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --certificate=FILE файл кліенцкага паÑведчаннÑ.\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2123,126 +2099,126 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Опцыі HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-iri адключыць падтрымку IRI.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-dns-cache адключыць кÑш вынікаў DNS пошуку.\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response друкаваць адказ ÑÑрвера.\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "Опцыі FTP:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2250,28 +2226,28 @@ msgstr "" " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " -nd, --no-directories не Ñтвараць дырÑкторыі.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2280,23 +2256,23 @@ msgstr "" " --ignore-case ігнараваць Ñ€ÑгіÑтар у назвах файлаў/" "дырÑкторыÑÑž.\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "РÑкурÑÑ–ÑžÐ½Ð°Ñ Ð·Ð°Ð¿Ð°Ð¼Ð¿Ð¾ÑžÐºÐ°:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2305,14 +2281,14 @@ msgstr "" " -t, --tries=NUMBER задае колькаÑць Ñпроб NUMBER (0 - " "неабмежавана).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --spider не запампоўваць уÑÑ‘.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2321,211 +2297,211 @@ msgid "" msgstr "" " -nc, --no-clobber абмінаць запампоўкі Ñ–Ñнуючых файлаў.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "РÑкурÑÑ–ÑžÐ½Ñ‹Ñ Ð´Ð°Ð·Ð²Ð¾Ð»Ñ‹/забароны:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=TYPE выбар выглÑду дыÑграмы прагрÑÑу.\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -h, --help друкую гÑтую даведку.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -x, --force-directories прымуÑіць Ñтвараць дырÑкторыі.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не ўваходзіць у бацькоўÑкую дырÑкторыю.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пажаданні на .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "ÐеінтÑрактыўны Ñеткавы запампоўнік GNU Wget %s.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Пароль карыÑтальіка %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Пароль:" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль карыÑтальіка %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Лакаль: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "КампілÑтар: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "СпаÑылка: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2534,29 +2510,29 @@ msgstr "" "GNU Wget %s ÑкампілÑваны на %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2009 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2570,7 +2546,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2578,65 +2554,65 @@ msgstr "" "\n" "ПершаÑтваральнік - Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "ЛіÑтуйце Ñправаздачы аб памылках Ñ– пытанні на .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "ПаÑпрабуйце \"%s --help\", каб пабачыць больш опцыÑÑž.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- \"-n%c\"\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðемагчыма адначаÑова быць шматÑлоўным Ñ– маўклівым.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2644,157 +2620,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Файл \"%s\" ужо тут; абмінаем.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: прапушчаны URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðельга адначаÑова выбіраць --ask-password Ñ– --password.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "ГÑÑ‚Ð°Ñ Ð²ÐµÑ€ÑÑ–Ñ Ð½Ñ Ð¼Ð°Ðµ падтрымкі IRIs\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: немагчыма вызначыць назву вузла %s\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "ÐÑ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹ URL у %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðемагчыма выдаліць %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2804,7 +2775,7 @@ msgstr "" "ЗÐВЕРШÐÐÐ --%s--\n" "Запампавана: %d файлаў, %s у %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Квота запампоўкі (%s) перавышана!\n" @@ -2961,117 +2932,117 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Выдаленьне %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Праца працÑгнецца Ñž фоне.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Праца працÑгнецца Ñž фоне, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Вывад будзе запіÑаны Ñž %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: невÑдомы токен \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ВыкарыÑтаньне: %s NETRC [ÐÐЗВÐ_ВУЗЛÐ]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: немагчыма выканаць stat %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Ðапаткана ÑамападпіÑанае паÑведчанне.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3079,12 +3050,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3093,29 +3064,29 @@ msgstr "" "\n" "%*s[ абмінаем %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " ~ %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " у " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "" @@ -3129,22 +3100,22 @@ msgstr "Ðемагчыма адкрыць %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Загружаецца robots.txt; калі лаÑка, не зьвÑртайце ўвагі на памылкі.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Памылка разбору URL паўнамоцнага паÑлужніка %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Памылка Ñž URL паўнамоцнага паÑлужніка %s: муÑіць быць HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "перавышÑньне колькаÑьці перанакіраваньнÑÑž (%d).\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3152,7 +3123,7 @@ msgstr "" "ЗдаемÑÑ.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3160,125 +3131,125 @@ msgstr "" "Паўтараем Ñпробу.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "ÐÑма памылак" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Схема %s не падтрымліваецца" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "ÐдÑутнічае Ñхема" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "ÐÑдзейÑÐ½Ð°Ñ Ð½Ð°Ð·Ð²Ð° вузла" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "КепÑкі нумар порта" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "ÐÑдзейÑнае ўліковае імÑ" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Ðезавершаны Ð°Ð´Ñ€Ð°Ñ IPv6" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "ÐдраÑÑ‹ IPv6 не падтрымліваюцца" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "КепÑкі Ð°Ð´Ñ€Ð°Ñ IPv6" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Падтрымка HTTPS не ўбудаванаÑ" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: немагчыма размеркаваць даÑтаткова памÑці; памÑць вычÑрпанаÑ.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: немагчыма размеркаваць %ld байтаў; памÑць вычÑрпанаÑ.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: Ñ‚ÑкÑтавы буфер завÑлікі (%ld байтаў); аварыйнае завÑршÑнне.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Праца працÑгваецца Ñž тле, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Ðемагчыма выдаліць ÑпаÑылку %s: %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: немагчыма вызначыць назву вузла %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ðемагчыма атрымаць ключ паÑÑŒÐ²ÐµÐ´Ñ‡Ð°Ð½ÑŒÐ½Ñ Ð· %s\n" +msgstr "Ðемагчыма загрузіць паÑьведчаньні з %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Памылка запіÑу Ñž %s: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3357,32 +3328,23 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#~ msgid "" -#~ "Found no broken links.\n" -#~ "\n" -#~ msgstr "" -#~ "Ð—Ð»Ð°Ð¼Ð°Ð½Ñ‹Ñ ÑпаÑылкі Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹.\n" -#~ "\n" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\" не дазвалÑе довады\n" -#~ msgid "" -#~ "Found %d broken link.\n" -#~ "\n" -#~ msgid_plural "" -#~ "Found %d broken links.\n" -#~ "\n" -#~ msgstr[0] "" -#~ "Знойдзена %d Ð·Ð»Ð°Ð¼Ð°Ð½Ð°Ñ ÑпÑылка.\n" -#~ "\n" -#~ msgstr[1] "" -#~ "Знойдзены %d Ð·Ð»Ð°Ð¼Ð°Ð½Ñ‹Ñ ÑпÑылкі.\n" -#~ "\n" -#~ msgstr[2] "" -#~ "Знойдзена %d зламаных ÑпÑылак.\n" -#~ "\n" +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: нераÑÐ¿Ð°Ð·Ð½Ð°Ð½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ \"--%s\"\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: нерÑчаіÑны URL %s: %s\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- %c\n" + +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" зьÑўлÑецца неадназначнай\n" + +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Ð¾Ð¿Ñ†Ñ‹Ñ \"-W %s\" не дазвалÑе аргумÑнты\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Збой аўтарызаваньнÑ.\n" #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "збой idn_decode (%d): %s\n" @@ -3394,12 +3356,6 @@ msgstr "" #~ "\n" #~ "%s атрымана.\n" -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ñ‹Ñ -- %c\n" - -#~ msgid "Authorization failed.\n" -#~ msgstr "Збой аўтарызаваньнÑ.\n" - #~ msgid "" #~ "GNU Wget %s built on VMS %s %s.\n" #~ "\n" @@ -3410,6 +3366,9 @@ msgstr "" #~ msgid "Currently maintained by Micah Cowan .\n" #~ msgstr "БÑгучы раÑпрацоўнік - Micah Cowan .\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Файл \"%s\" ужо тут; абмінаем.\n" + #~ msgid "" #~ "WARNING: Can't reopen standard output in binary mode;\n" #~ " downloaded file may contain inappropriate line endings.\n" @@ -3417,6 +3376,29 @@ msgstr "" #~ "УВÐГÐ! Ðемагчыма адкрыць Ñтандартны вывад у бінарным Ñ€Ñжыме;\n" #~ " запампаваны файл можа ўтрымліваць Ð½ÐµÐ´Ð°ÐºÐ»Ð°Ð´Ð½Ñ‹Ñ ÐºÐ°Ð½Ñ†Ñ‹ радкоў.\n" +#~ msgid "" +#~ "Found no broken links.\n" +#~ "\n" +#~ msgstr "" +#~ "Ð—Ð»Ð°Ð¼Ð°Ð½Ñ‹Ñ ÑпаÑылкі Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹.\n" +#~ "\n" + +#~ msgid "" +#~ "Found %d broken link.\n" +#~ "\n" +#~ msgid_plural "" +#~ "Found %d broken links.\n" +#~ "\n" +#~ msgstr[0] "" +#~ "Знойдзена %d Ð·Ð»Ð°Ð¼Ð°Ð½Ð°Ñ ÑпÑылка.\n" +#~ "\n" +#~ msgstr[1] "" +#~ "Знойдзены %d Ð·Ð»Ð°Ð¼Ð°Ð½Ñ‹Ñ ÑпÑылкі.\n" +#~ "\n" +#~ msgstr[2] "" +#~ "Знойдзена %d зламаных ÑпÑылак.\n" +#~ "\n" + #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Памылка Ñž Set-Cookie, поле \"%s\"" diff --git a/po/bg.gmo b/po/bg.gmo index 31faed5..6dfbf98 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 2011652..1f15f99 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2002-03-18 03:11\n" "Last-Translator: Yassen Roussev \n" "Language-Team: Bulgarian \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Ðепозната грешка" @@ -27,7 +27,7 @@ msgstr "Ðепозната грешка" msgid "Address family for hostname not supported" msgstr "" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -95,70 +95,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ðепозната грешка" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: опциÑта `%s' е многозначна\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: опциÑта `%s' е многозначна\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: опциÑта `--%s' не позволÑва аргумент\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: неразпозната Ð¾Ð¿Ñ†Ð¸Ñ `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опциÑта `%c%s' не позволÑва аргумент\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опциÑта `%s' изиÑква аргумент\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: неразпозната Ð¾Ð¿Ñ†Ð¸Ñ `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: неразпозната Ð¾Ð¿Ñ†Ð¸Ñ `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: невалидна Ð¾Ð¿Ñ†Ð¸Ñ -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опциÑта изиÑква аргумент -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: опциÑта `%s' е многозначна\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: опциÑта `--%s' не позволÑва аргумент\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: опциÑта `%s' изиÑква аргумент\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -178,13 +153,13 @@ msgstr "%s: опциÑта `%s' изиÑква аргумент\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -256,28 +231,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -296,51 +271,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, fuzzy, c-format msgid "Connecting to %s|%s|:%d... " msgstr "УÑтановÑване на контакт Ñ %s[%s]:%hu... " -#: src/connect.c:291 +#: src/connect.c:289 #, fuzzy, c-format msgid "Connecting to %s:%d... " msgstr "УÑтановÑване на контакт Ñ %s:%hu... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "УÑтановÑване на контакт Ñ %s[%s]:%hu... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "уÑпешно Ñвързване.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "неуÑпÑ: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -374,175 +349,175 @@ msgstr "Ðемога да Ð¸Ð·Ñ‚Ñ€Ð¸Ñ `%s': %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ðемога да подÑÐ¸Ð³ÑƒÑ€Ñ %s като %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Ðемога да Ð¸Ð·Ñ‚Ñ€Ð¸Ñ `%s': %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, fuzzy, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Синтактична грешка при Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Set-Cookie: неправилен низ.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ðе мога да Ð¾Ñ‚Ð²Ð¾Ñ€Ñ cookies файла \"cookies\", `%s': %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° `%s': %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Грешка при затварÑне на `%s': %s\n" # ^ msgstr "Грешка при затварÑне на `%s': %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Ðеподдържан вид лиÑтинг, пробвам Ñ Ð´Ñ€ÑƒÐ³ Unix лиÑтинг превождач.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð¾Ñ‚ /%s върху %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "неизвеÑтно време " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Файл " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Линк " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Ðе Ñъм Ñигурен " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s байта)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Дължина: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (недоÑтоверно)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Логвам Ñе като %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Сървърът праща Ñъобщение за грешка, Ñпирам управлÑващата връзка.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Грешка при ръкуването ÑÑŠÑ Ñървъра.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "ПиÑането Ñе провали, прекъÑвам управлÑващата връзка.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Сървърът не приема логин.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Ðеправилен логин.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "УÑпешно логване!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Грешка при Ñървъра, не мога да Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ Ð²Ð¸Ð´Ð° ÑиÑтема .\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "готово. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "готово.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Ðепознат тип `%c', Ñпирам управлÑващата връзка.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "готово. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD не е необходимо.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -550,7 +525,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -559,38 +534,38 @@ msgstr "" "ÐÑма такава Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ `%s'.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD не е необходимо.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ðе мога да започна паÑивен транÑфер.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ðе мога да разбера PASV отговора.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, fuzzy, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "немога да Ñе Ñвържа към %s:%hu: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Грешка при Ñвързване (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ðевалиден порт.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -598,19 +573,19 @@ msgstr "" "\n" "Грешка при REST, започвам отначало.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "ÐÑма такъв файл `%s'.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -619,7 +594,7 @@ msgstr "" "ÐÑма такъв файл `%s'.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -628,47 +603,47 @@ msgstr "" "ÐÑма такъв файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ `%s'.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, Ñпирам управлÑващата връзка.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Връзка за данни: %s: " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "ОÑновната връзка бе затворена.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "ТранÑферът бе прекъÑнат.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(опит:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -677,51 +652,51 @@ msgstr "" "%s (%s) - `%s' запиÑан [%ld]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Премахвам %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "Ползвам `%s' като временен ÑпиÑък файл.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "Премахвам `%s'.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Дълбочина на рекурÑиÑта %d надвишава макÑ. дълбочина %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Файлът от Ñървъра не е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- не продължавам.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "Файлът на Ñървъра е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- започвам да Ñ‚eглÑ.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "Големината не Ñъвпада (меÑтен %ld) -- започвам да Ñ‚eглÑ.\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ðевалидно име на Ñимволична връзка, пропуÑкам.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -730,375 +705,375 @@ msgstr "" "Символичната връзка е вече поправена %s -> %s.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Създавам Ñимволична връзка %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Символичните връзки не Ñа поддържат, пропуÑкам `%s'.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "ПропуÑкам Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ `%s'.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: неизвеÑтен/неподдържан вид файл.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: недоÑтоверен времеви печат.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "ÐÑма да Ñ‚ÐµÐ³Ð»Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸, защото дълбочината е %d (макÑимум %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе влизам в `%s', тъй като Ñ‚Ñ Ðµ изключенa/не е включенa.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Отказвам `%s'.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° `%s': %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "ÐÑма ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð·Ð° пример `%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ЗапиÑах HTML-изиран Ð¸Ð½Ð´ÐµÐºÑ Ð² `%s' [%ld].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ЗапиÑах HTML-изиран Ð¸Ð½Ð´ÐµÐºÑ Ð² `%s'.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 #, fuzzy msgid "Unknown host" msgstr "Ðепозната грешка" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Преобразувам %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 #, fuzzy msgid "failed: timed out.\n" msgstr "неуÑпÑ: %s.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ðе мога да изаÑÐ½Ñ Ð½ÐµÑÑŠÐ²ÑŠÑ€ÑˆÐµÐ½Ð½Ð¸Ñ Ð»Ð¸Ð½Ðº %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, fuzzy, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° HTTP иÑкане: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Използване на вече уÑтановена връзка към %s:%hu.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Използване на вече уÑтановена връзка към %s:%hu.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° HTTP иÑкане: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Деформиран ÑтатуÑ" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ðепознат начин на удоÑтоверение.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Ðепознат начин на удоÑтоверение.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s изпратено иÑкане, чакам отговор... " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "Ðе Ñе получават данни" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Грешка при четене (%s) в заглавките.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(без опиÑание)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "ÐдреÑ: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "неопределен" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [Ñледва]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1106,7 +1081,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1116,101 +1091,101 @@ msgstr "" " Файлът е вече изтеглен; нÑма друга задача.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Дължина: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "игнориран" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Внимание: ÑƒÐ°Ð¹Ð»Ð´ÐºÐ°Ñ€Ð´Ñ Ð½Ðµ Ñе поддържат в HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ðемога да уÑÑ‚Ð°Ð½Ð¾Ð²Ñ SSL връзка.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðемога да запиша върху `%s' (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: Пре-адреÑÐ°Ñ†Ð¸Ñ (%d) без уÑтановен адреÑ.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна липÑва -- полето за " "дата Ñе изключва.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавката Ñъдържаща Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно поÑледна промÑна е невалиднa -- " "полето за дата Ñе игнорира.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "Файлът на Ñървъра не е по-нов от този на диÑка `%s' -- Ñпирам.\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Големините не Ñъвпадат (меÑтен %ld) -- продължавам.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1218,40 +1193,40 @@ msgid "" "\n" msgstr "Файлът на Ñървъра е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- започвам да Ñ‚eглÑ.\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Файлът от Ñървъра не е по-нов от меÑÑ‚Ð½Ð¸Ñ `%s' -- не продължавам.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Файлът на Ñървъра е по-нов, продължавам.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ГРЕШКÐ: %d: %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1260,58 +1235,58 @@ msgstr "" "%s (%s) - `%s' запиÑан [%ld/%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Връзката бе преуÑтановена при байт %ld. " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Грешка при четене, байт %ld (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Грешка при четене, байт %ld/%ld (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:582 +#: src/init.c:581 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðемога да прочета %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Грешка при %s в ред %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Грешка при %s в ред %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: БЪГ: непозната команда `%s', ÑтойноÑÑ‚ `%s'.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1319,7 +1294,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1327,115 +1302,115 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Внимание: СиÑтемниÑÑ‚ wgetrc и личниÑÑ‚ Ñочат към `%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s: невалидна команда\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ÐœÐ¾Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÑ‚Ðµ on или off.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðевалиден вид напредък `%s'.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ðевалидна ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðевалиден вид напредък `%s'.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "немога да Ñе Ñвържа към %s:%hu: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1444,17 +1419,17 @@ msgstr "" "\n" "%s получени, пре-адреÑиране на резултата към `%%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; Ñпирам запиÑването.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Употреба: %s [ОПЦИЯ]... [УРЛ]...\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1465,291 +1440,291 @@ msgstr "" "опроÑтен вид.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1760,212 +1735,212 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 #, fuzzy msgid "Directories:\n" msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ " -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1973,13 +1948,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1987,58 +1962,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2048,406 +2023,406 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, не-интерактивен мрежов Ñофтуеър за транÑфер.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Запазени авторÑки права (C) 1995-2001 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2457,7 +2432,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 #, fuzzy msgid "" "\n" @@ -2466,66 +2441,66 @@ msgstr "" "\n" "ПървонапиÑана от Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Изпращайте ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° грешки и Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Опитайте `%s --help' за повече опции.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: невалидна Ð¾Ð¿Ñ†Ð¸Ñ -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: поддръжката на \"debug\" не е компилирана.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðе може да бъде \"многоÑловен\" и \"тих\" едновременно.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Ðе мога да Ñложа дата, но и да не презапиша едновременно\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2533,157 +2508,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Файлът `%s' е вече тук, нÑма да го теглÑ.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: УРЛ не е указан\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "УРЛ не е открит в %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðемога да Ð¸Ð·Ñ‚Ñ€Ð¸Ñ `%s': %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2694,7 +2664,7 @@ msgstr "" "ГОТОВО --%s--\n" "Изтеглени: %s байта в %d файла\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Квотата от (%s байта) бе ПРЕВИШЕÐÐ!\n" @@ -2850,118 +2820,118 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Премахвам %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Продължавам на заден план.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Продължавам на заден план, pid %d.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Резултатът ще бъде запиÑван в `%s'.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ðемога да Ð½Ð°Ð¼ÐµÑ€Ñ Ð¿Ð¾Ð´Ñ…Ð¾Ð´Ñщ TCP/IP драйвер.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: внимание: \"%s\" има Ñимвол преди името на машината\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: непознат Ñимвол \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Употреба: %s NETRC [ИМЕ ÐРХОСТ]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: непълен формат %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ðе мога да Ð½Ð°Ð¼ÐµÑ€Ñ OpenSSL PRNG; продължавам без SSL.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2969,12 +2939,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -2983,28 +2953,28 @@ msgstr "" "\n" "%*s[ пропуÑкам %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Ðевалидна точкова ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ `%s'; оÑтавам непроменено.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Премахване на %s, Ñлед като той би Ñ‚Ñ€Ñбвало да бъде отхвърлен.\n" @@ -3018,22 +2988,22 @@ msgstr "Ðемога да преобразувам линковете в %s: %s\ msgid "Loading robots.txt; please ignore errors.\n" msgstr "Зареждам robots.txt; Ð¼Ð¾Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ грешките.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка при транÑлирането на прокÑи УРЛ %s: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка при прокÑи УРЛ %s: ТрÑбва да е HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d пре-адреÑациите бÑха твърде много.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3041,7 +3011,7 @@ msgstr "" "Отказвам Ñе.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3049,126 +3019,126 @@ msgstr "" "Продължавам.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 #, fuzzy msgid "No error" msgstr "Ðепозната грешка" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr "%s: поддръжката на \"debug\" не е компилирана.\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Продължавам на заден план, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Грешка при изтриване на Ñимволична връзка `%s': %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "ÐеуÑпех при взимане на ключа към Ñертификата от %s\n" +msgstr "ÐеуÑпех при зареждане на Ñертификати от %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° `%s': %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3246,12 +3216,6 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "Ðе Ñе получават данни" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Грешка в Set-Cookie, поле `%s'" @@ -3268,6 +3232,12 @@ msgstr "" #~ msgid " [%s to go]" #~ msgstr " [ОÑтават %s]" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: опциÑта `--%s' не позволÑва аргумент\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: неразпозната Ð¾Ð¿Ñ†Ð¸Ñ `--%s'\n" + #~ msgid "Host not found" #~ msgstr "ХоÑÑ‚ÑŠÑ‚ не бе открит" diff --git a/po/ca.gmo b/po/ca.gmo index 1983521..9fdfe33 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 86a1331..d6b712f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2015-08-04 09:23+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -20,7 +20,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "S'ha produït un error del sistema desconegut" @@ -28,7 +28,7 @@ msgstr "S'ha produït un error del sistema desconegut" msgid "Address family for hostname not supported" msgstr "La família d'adreces per al nom del servidor no està implementada" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "S'ha produït un error temporal en la resolució de noms" @@ -96,70 +96,45 @@ msgstr "Ha estat interromput per un senyal" msgid "Parameter string not correctly encoded" msgstr "La cadena del paràmetre no està codificada correctament" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "S'ha produït un error desconegut" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'opció «%s» és ambigua; possibilitats:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'opció «-W %s» és ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: l'opció «--%s» no admet arguments\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: l'opció «%s» és ambigua; possibilitats:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: l'opció «%c%s» no és reconeguda\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'opció «%c%s» no admet arguments\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'opció «--%s» necessita un argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: l'opció «--%s» no és reconeguda\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: l'opció «%c%s» no és reconeguda\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: l'opció «%c» no és vàlida\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s l'opció «%c» necessita un argument\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: l'opció «-W %s» és ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: l'opció «-W %s» no admet arguments\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: l'opció «-W %s» necessita un argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -179,13 +154,13 @@ msgstr "%s: l'opció «-W %s» necessita un argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -261,28 +236,28 @@ msgstr "L'expressió regular %s no és vàlida, %s\n" msgid "Unmatched ) or \\)" msgstr ") o \\) desaparellat" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "No hi ha una expressió regular %s prèvia" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "no es pot crear una canonada" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "El subprocés %s ha fallat" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle ha fallat" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "no es pot restaurar el fd %d: dup2 ha fallat" @@ -302,53 +277,53 @@ msgid "memory exhausted" msgstr "la memòria s'ha exhaurit" # Bind? jm -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: no s'ha pogut resoldre l'adreça de vinculació %s; s'està inhabilitant la " "connexió.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "S'està connectant a %s|%s|:%d… " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "S'està connectant a %s:%d… " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "S'està connectant a [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "connectat.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "error: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: no s'ha pogut resoldre l'adreça del servidor «%s»\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,182 +357,182 @@ msgstr "No s'ha pogut suprimir %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "No es pot fer una còpia de %s com a %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "No s'ha pogut obtenir la galeta per a %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "" "S'ha produït un error de sintaxi a la capçalera Set-Cookie: %s a la posició " "%d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "La galeta provinent de %s ha intentat establir el domini a " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "No es pot obrir el fitxer de cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "S'ha produït un error en escriure a %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "S'ha produït un error en tancar %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "El tipus de llista no és suportat, es prova amb l'analitzador de Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ãndex de /%s a %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "data desconeguda " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fitxer " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Directori " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Enllaç " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "No és segur " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s octets)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Mida: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restant" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s restant" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (no autoritatiu)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "S'està entrant com a «%s» … " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "" "S'ha produït un error en la resposta del servidor, es tanca la connexió de " "control.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "S'ha produït un error en el missatge de benvinguda del servidor.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "" "S'ha produït un error d'escriptura, s'està tancant la connexió de control.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "El servidor rebutja les peticions d'entrada.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Entrada incorrecta.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "S'ha entrat amb èxit!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "" "S'ha produït un error del servidor, no es pot determinar el tipus de " "sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "fet. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "fet.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "El tipus «%c» és desconegut , es tanca la connexió de control.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "fet. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD innecessari.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "S'ha arribat a una secció lògicament impossible a getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -568,7 +543,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -577,37 +552,37 @@ msgstr "" "El directori %s no existeix.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD no requerit.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "El fitxer ja s'ha obtingut.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "No s'ha pogut iniciar la transferència PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "No s'ha pogut analitzar la resposta PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "no s'ha pogut connectar a %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "S'ha produït un error en vincular (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT incorrecte.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -615,17 +590,17 @@ msgstr "" "\n" "REST ha fallat, s'està començant des del principi.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "El fitxer %s existeix.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "El fitxer %s no existeix.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -634,7 +609,7 @@ msgstr "" "El fitxer %s no existeix.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -643,40 +618,40 @@ msgstr "" "El fitxer o directori %s no existeix.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ha començat a existir.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, es tanca la connexió de control.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Connexió de dades: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Connexió de control tancada.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "S'ha avortat la transferència de dades.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "El fitxer %s ja existeix, no es baixa.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(intent:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -685,7 +660,7 @@ msgstr "" "%s (%s) - imprimit per la sortida estàndard %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -694,33 +669,33 @@ msgstr "" "%s (%s) - s'ha desat %s [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "S'està suprimint %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "S'utilitza %s com a fitxer de llistat temporal.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "S'ha suprimit %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "La profunditat de recursió %d excedeix el màxim permès %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "El fitxer remot no és més nou que el local %s -- no es baixa.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -729,7 +704,7 @@ msgstr "" "El fitxer remot és més nou que el local %s -- s'està baixant.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -738,11 +713,11 @@ msgstr "" "Els fitxers no tenen la mateixa mida (local %s) -- s'està baixant.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "El nom de l'enllaç simbòlic no és correcte; s'omet.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -751,241 +726,241 @@ msgstr "" "Ja hi ha un enllaç simbòlic correcte %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "S'està creant l'enllaç simbòlic %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "No es suporten enllaços simbòlics; s'omet l'enllaç %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "S'està ometent el directori %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipus de fitxer desconegut o no suportat.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "No s'ha pogut obtenir la galeta per a %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: la marca de temps és corrupta..\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "No es baixaran els directoris ja que la profunditat és %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "No es descendeix a %s ja que està exclòs, o no inclòs.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "S'està rebutjant %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "S'ha produït un error en comparar %s amb %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Cap coincidència amb el patró %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "S'ha escrit un índex HTMLitzat a %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "S'ha escrit un índex HTMLitzat a %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: No es pot obrir el directori %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: No s'ha pogut obrir el certificat %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "S'ha produït un error en analitzar el certificat: %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERROR: No s'ha pogut carregar el fitxer CRL «%s»: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "S'ha carregat el fitxer CRL «%s»\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ERROR: GnuTLS requereix que la clau i certificat siguen del mateix tipus.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" "GnuTLS: el valor %d per l'opció «secure-protocol» no està implementat\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Informeu d'aquest problema a bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" "GnuTLS: el valor %d per l'opció «secure-protocol» no està implementat\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVÃS" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s no ha presentat cap certificat.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: No es confia en el certificat de %s.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: El certificat de %s no té un emissor conegut.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: El certificat de %s s'ha revocat.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: No es confia en el certificat de %s.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, fuzzy, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: El certificat de %s no té un emissor conegut.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: No es confia en el certificat de %s.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: El certificat de %s s'ha revocat.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "S'ha produït un error en inicialitzar el certificat X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "No s'ha trobat cap certificat\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "S'ha produït un error en analitzar el certificat: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "El certificat encara no s'ha activat\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "El certificat ha caducat\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "El propietari del certificat no concorda amb el nom del servidor %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "El certificat ha de ser X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "S'ha produït un error en gestionar la llista d'adreces.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Servidor desconegut" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "S'està resolent %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "error: No hi ha adreces IPv4/IPv6 per al servidor.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "error: s'ha exhaurit el temps.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: No s'ha pogut resoldre l'enllaç incomplet %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: L'URL %s no és vàlid: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "S'ha produït un error en escriure la petició HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "No hi ha capçaleres, s'assumeix HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -994,135 +969,135 @@ msgstr "" "El fitxer %s ja existeix, no es baixa.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "Manca el fitxer de dades POST %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "S'està reutilitzant la connexió a [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "S'està reutilitzant la connexió a %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "" "S'ha produït un error en llegir la resposta del servidor intermediari: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR: %d %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "La línia d'estat és malformada" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Ha fallat la tunelització del servidor intermediari: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "L'esquema d'autenticació és desconegut.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "L'esquema d'autenticació és desconegut.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "S'està desant a: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "S'està inhabilitant SSL a causa dels errors trobats.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s: s'ha enviat la petició, s'està esperant una resposta… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "No s'ha rebut cap dada\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "S'ha produït un error de lectura (%s) a les capçaleres.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sense descripció)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Ubicació: %s%s\n" # és femení: ubicació/mida. eac -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "no especificada" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [es segueix]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1130,7 +1105,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1140,81 +1115,81 @@ msgstr "" " El fitxer ja s'ha baixat totalment; res a fer.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Mida: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "s'ignora" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avís: En HTTP no es suporten patrons.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode aranya habilitat. Comprova si el fitxer remot existeix.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No s'ha pogut escriure a %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "S'ha rebut l'atribut requerit que mancava a Header.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "L'autenticació amb nom d'usuari/contrasenya ha fallat.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "No s'ha pogut escriure al fitxer WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "No s'ha pogut escriure al fitxer temporal WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "No s'ha pogut establir la connexió SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No s'ha pogut desenllaçar %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirecció (%d) sense ubicació.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "El fitxer remot no existeix -- enllaç trencat!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Falta la capçalera Last-modified -- s'han inhabilitat les marques de temps.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Capçalera Last-modified no vàlida -- s'omet la marca de temps.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1223,16 +1198,16 @@ msgstr "" "El fitxer remot no és més nou que el local %s -- no es baixa.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Les mides dels fitxers no coincideixen (local %s) -- s'està baixant.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "El fitxer remot és més nou, s'està baixant.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1242,7 +1217,7 @@ msgstr "" "obtenint.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1250,7 +1225,7 @@ msgstr "" "El fitxer remot existeix però no conté cap enllaç -- no s'obté.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1260,7 +1235,7 @@ msgstr "" "però la recursió és inhabilitada -- no es baixa.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1268,12 +1243,12 @@ msgstr "" "El fitxer remot existeix.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1282,7 +1257,7 @@ msgstr "" "%s (%s) - escrit a la sortida estàndard %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1291,58 +1266,58 @@ msgstr "" "%s (%s) - s'ha desat %s [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - S'ha tancat la connexió a l'octet %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - S'ha produït un error de lectura a l'octet %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - S'ha produït un error de lectura a l'octet %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "La qualitat de la protecció «%s» no és implementada.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "La qualitat de la protecció «%s» no és implementada.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: La variable WGETRC apunta a %s, que no existeix.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No s'ha pogut llegir %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: S'ha produït un error a %s, línia %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: S'ha produït un error de sintaxi a %s, línia %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: L'ordre %s és desconeguda a %s, línia %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1354,7 +1329,7 @@ msgstr "" "«%s»,\n" "o especifiqueu un fitxer diferent emprant --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1367,75 +1342,75 @@ msgstr "" # es refereix a variables d'entorn o què? eac # es refereix als dotfiles .wgetrc, etc. jm -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Avís: El wgetrc del sistema i de l'usuari apunten a %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: L'ordre --execute %s no és vàlida.\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: El booleà %s no és vàlid; useu «on» o «off».\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: El booleà %s no és vàlid; useu «on» o «off».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: El número %s no és vàlid.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s només es pot emprar una vegada\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: El valor %s de l'octet no és vàlid.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: El període de temps %s no és vàlid.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: El valor %s no és vàlid.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: La capçalera %s no és vàlida.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: La capçalera WARC %s no és vàlida.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: El tipus d'indicador de progrés %s no és vàlid.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1444,40 +1419,40 @@ msgstr "" "%s: %s: La restricció «%s» no és vàlida,\n" " empreu [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "La codificació %s no és vàlida\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, fuzzy, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "La conversió de %s a %s no és implementada\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "S'ha trobat una seqüència multioctet incompleta o invàlida\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Número d'error no gestionat %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: el locale no és establert\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "Ha fallat «idn_encode» (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "no s'ha pogut connectar a %s port %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1486,17 +1461,17 @@ msgstr "" "\n" "%s rebut, la sortida es redirigeix a %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; s'està inhabilitant el registre.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Forma d'ús: %s [OPCIÓ]… [URL]…\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1505,69 +1480,69 @@ msgstr "" "curtes.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Inici:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version mostra la versió del Wget i surt.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help mostra aquesta ajuda.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background vés a segon terme després de l'inici.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=ORDRE executa una ordre d'estil «.wgetrc».\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Registres i fitxer d'entrada:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=FITXER desa els missatges del programa a FITXER.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FITXER afegeix els missatges a FITXER.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug mostra molta informació de depuració.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug mostra informació de depuració de Watt-32.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet mode silenciós (cap sortida).\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose mode detallat (per defecte).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1576,7 +1551,7 @@ msgstr "" " -nv, --no-verbose mode no detallat, però tampoc del tot " "silenciós.\n" -#: src/main.c:603 +#: src/main.c:612 #, fuzzy msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " @@ -1585,7 +1560,7 @@ msgstr "" " --report-speed=TIPUS Mostra l'ample de banda com a TIPUS.\n" " TIPUS pot ser bits.\n" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1594,7 +1569,7 @@ msgstr "" " -i, --input-file=FITXER baixa les URL que es troben al FITXER local\n" " o extern.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1603,12 +1578,12 @@ msgstr "" " -i, --input-file=FITXER baixa les URL que es troben al FITXER local\n" " o extern.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html tracta el fitxer d'entrada com a HTML.\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1617,29 +1592,29 @@ msgstr "" " -B, --base=URL resol els enllaços de fitxers d'entrada HTML\n" " (-i -F) relatius a URL.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FITXER Especifica el fitxer de configuració a emprar.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:620 +#: src/main.c:629 #, fuzzy msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " -o, --output-file=FITXER desa els missatges del programa a FITXER.\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Baixada:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1648,7 +1623,7 @@ msgstr "" " -t, --tries=NOMBRE estableix el nombre de reintents (0=sense " "limit).\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1656,12 +1631,12 @@ msgstr "" " --retry-connrefused reintenta encara que es rebutje la " "connexió.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FITXER escriu els documents a FITXER.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1670,14 +1645,14 @@ msgstr "" " -nc, --no-clobber omet baixades de fitxers ja existents\n" " (sobreescrivint-los).\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1685,7 +1660,7 @@ msgstr "" " -c, -­continue continua obtenint un fitxer baixat " "parcialment\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1693,13 +1668,13 @@ msgstr "" " --start-pos=Ã’FSET comença a baixar des de la posició basada " "en zero Ã’FSET\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPUS selecciona el tipus d'indicador de " "progrés\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1707,7 +1682,7 @@ msgstr "" " --show-progress mostra la barra de progrés en qualsevol " "mode de detall\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1717,7 +1692,7 @@ msgstr "" "els\n" " locals\n" -#: src/main.c:648 +#: src/main.c:657 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1729,7 +1704,7 @@ msgstr "" " fitxer local basada en la del " "servidor.\n" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1740,30 +1715,30 @@ msgstr "" " fitxer local basada en la del " "servidor.\n" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response mostra les respostes del servidor.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider no baixes res.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEGONS estableix tots els temps d'espera a " "SEGONS.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1773,34 +1748,34 @@ msgstr "" "a\n" " localhost.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEGONS estableix el temps d'espera de DNS a " "SEGONS.\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEGONS estableix el temps d'espera de connexió a\n" " SEGONS.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEGONS estableix el temps d'espera de lectura en\n" " SEGONS.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEGONS fes una pausa de SEGONS entre baixades.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1809,7 +1784,7 @@ msgstr "" " --waitretry=SEGONS fes una pausa entre intents de baixada de\n" " 1…SEGONS.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1819,20 +1794,20 @@ msgstr "" "segons\n" " entre baixades.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy inhabilita explícitament l'ús del servidor\n" " intermediari.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NOMBRE estableix la quota de baixada a NOMBRE.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1842,13 +1817,13 @@ msgstr "" "a\n" " localhost.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=NOMBRE estableix el límit d'octets per segon.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" @@ -1856,7 +1831,7 @@ msgstr "" "noms\n" " de domini.\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1867,7 +1842,7 @@ msgstr "" "operatiu)\n" " permeta.\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1877,17 +1852,17 @@ msgstr "" "quan\n" " es busquen fitxers/directoris coincidents.\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only connecta només a adreces IPv4.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only connecta només a adreces IPv6.\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1898,14 +1873,14 @@ msgstr "" "especificada,\n" " IPv6, IPv4 o cap.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=USUARI estableix els usuaris de ftp i http a " "USUARI.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" @@ -1913,12 +1888,12 @@ msgstr "" " --password=CONTRASENYA estableix la contrasenya de ftp i http a\n" " CONTRASENYA.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password demana la contrasenya.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1929,12 +1904,12 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri inhabilita el suport per a IRI.\n" -#: src/main.c:714 +#: src/main.c:723 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1942,7 +1917,7 @@ msgstr "" " --local-encoding=COD empra COD com a codificació local pels " "IRI.\n" -#: src/main.c:716 +#: src/main.c:725 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1950,39 +1925,37 @@ msgstr "" " --remote-encoding=COD empra COD com a codificació remota per " "defecte.\n" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr "" " --unlink suprimeix el fitxer abans de sobreescriure'l\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=NOMBRE estableix la quota de baixada a NOMBRE.\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " @@ -1991,38 +1964,38 @@ msgstr "" " --no-glob inhabilita l'ús de comodins de fitxers per a " "FTP.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Directoris:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories no crees directoris.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories força la creació de directoris.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories no crees els directoris del servidor.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usa el nom del protocol als directoris.\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX desa els fitxers a PREFIX/…\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -2031,29 +2004,29 @@ msgstr "" " --cut-dirs=NOMBRE omet NOMBRE components de l'estructura de\n" " directoris remota.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opcions d'HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USUARI estableix l'usuari http en USUARI.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-passwd=PASS estableix la contrasenya http en PASS.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache no admetes dades de la memòria cau del " "servidor.\n" -#: src/main.c:760 +#: src/main.c:769 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -2062,7 +2035,7 @@ msgstr "" " --default-page=NOM Canvia el nom per defecte de la pàgina\n" " (normalment aquest és «index.html».).\n" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2071,19 +2044,19 @@ msgstr "" " -E, --adjust-extension desa els documents HTML/S amb extensions\n" " correctes.\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length descarta la capçalera «Content-Length».\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=CADENA insereix CADENA entre les capçaleres.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2092,26 +2065,26 @@ msgstr "" " --progress=TIPUS selecciona el tipus d'indicador de " "progrés\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect redireccions màximes permeses per pàgina.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=USUARI estableix l'usuari pel proxy a USUARI.\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-passwd=PASS estableix la contrasenya pel proxy a PASS.\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2120,13 +2093,13 @@ msgstr "" " --referer=URL inclou una capçalera «Referer» a la petició " "HTTP.\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers desa les capçaleres HTTP en un fitxer.\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2135,7 +2108,7 @@ msgstr "" " -U, --user-agent=AGENT identifica't com a AGENT en lloc de Wget/" "VERSIÓ.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2144,12 +2117,12 @@ msgstr "" " --no-http-keep-alive inhabilita el «keep-alive» d'HTTP\n" " (connexions persistents)\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies no utilitzes galetes.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" @@ -2157,14 +2130,14 @@ msgstr "" " --load-cookies=FITXER carrega les galetes de FITXER abans de\n" " la sessió.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FITXER desa les cookies a FITXER després de la " "sessió.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2173,7 +2146,7 @@ msgstr "" " --keep-session-cookies carrega i desa les galetes de la sessió\n" " (no permanents)\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2182,7 +2155,7 @@ msgstr "" " --post-data=CADENA usa el mètode POST, envia CADENA com a " "dades.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2191,14 +2164,14 @@ msgstr "" " --post-file=FITXER usa el mètode POST, envia els continguts de\n" " FITXER.\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=MètodeHTTP empra el mètode «MètodeHTTP» a la " "petició\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2206,7 +2179,7 @@ msgstr "" " --body-data=CADENA envia CADENA com a dades. --method HA " "D'ESTAR establert.\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2214,7 +2187,7 @@ msgstr "" " --body-file=FITXER envia el contingut de FITXER.\n" " --method HA D'ESTAR establert\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2227,7 +2200,7 @@ msgstr "" " es seleccionen noms de fitxers locals\n" " (EXPERIMENTAL)\n" -#: src/main.c:808 +#: src/main.c:817 #, fuzzy msgid "" " --content-on-error output the received content on server " @@ -2236,7 +2209,7 @@ msgstr "" " --content-on-error mostra el contingut rebut als errors del\n" " servidor.\n" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2248,11 +2221,11 @@ msgstr "" " sense primer esperar la negociació del\n" " servidor.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcions d'HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2262,46 +2235,46 @@ msgstr "" " --secure-protocol=PR selecciona el protocol segur, d'entre auto,\n" " SSLv2, SSLv3, TLSv1.\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative només segueix enllaços relatius.\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate no valides el certificat del servidor.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificat=FITXER fitxer del certificat del client.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TIPUS tipus de certificat del client, PEM o DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FITXER fitxer de clau privada.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TIPUS tipus de clau privada, PEM o DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FITXER fitxer amb el conjunt de CA.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2310,12 +2283,12 @@ msgstr "" " --ca-directory=DIR directori on s'emmagatzema una llista de\n" " dispersió de CA.\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FITXER fitxer amb el conjunt de CA.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2325,7 +2298,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2334,7 +2307,7 @@ msgstr "" " --random-file=FITXER fitxer amb dades aleatòries per a fer de\n" " llavor per al SSL PRNG.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2344,30 +2317,30 @@ msgstr "" "aleatòries.\n" "\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Opcions d'HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache no admetes dades de la memòria cau del " "servidor.\n" -#: src/main.c:861 +#: src/main.c:870 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose mode detallat (per defecte).\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opcions d'FTP:\n" -#: src/main.c:869 +#: src/main.c:878 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2377,31 +2350,31 @@ msgstr "" "fitxers\n" " d'FTP binaris.\n" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USUARI estableix l'usuari de ftp a USUARI.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PASS estableix la contrasenya de ftp a PASS.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing no suprimeixes els fitxers «.listing».\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob inhabilita l'ús de comodins de fitxers per a " "FTP.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2409,13 +2382,13 @@ msgstr "" " --no-passive-ftp inhabilita el mode de transferència " "«passiu».\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preserva els permisos dels fitxers remots.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2426,12 +2399,12 @@ msgstr "" "siguen\n" " directoris\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Opcions d'FTP:\n" -#: src/main.c:891 +#: src/main.c:900 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2441,7 +2414,7 @@ msgstr "" "fitxers\n" " d'FTP binaris.\n" -#: src/main.c:893 +#: src/main.c:902 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2451,23 +2424,23 @@ msgstr "" " --trust-server-names empra el nom especificat per l'últim\n" " component de l'URL de la redirecció.\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opcions de WARC:\n" -#: src/main.c:904 +#: src/main.c:913 #, fuzzy msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " @@ -2477,14 +2450,14 @@ msgstr "" "fitxer\n" " .warc.gz.\n" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=CADENA insereix CADENA al registre warcinfo.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2492,12 +2465,12 @@ msgstr "" " --warc-max-size=NÚMERO estableix la mida màxima dels fitxers WARC\n" " a NÚMERO.\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx escriu fitxers d'índex CDX.\n" -#: src/main.c:912 +#: src/main.c:921 #, fuzzy msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " @@ -2507,19 +2480,19 @@ msgstr "" "aquest\n" " fitxer CDX.\n" -#: src/main.c:915 +#: src/main.c:924 #, fuzzy msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression no comprimeixes els fitxers WARC amb GZIP.\n" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests no calcules els resums SHA1.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2528,7 +2501,7 @@ msgstr "" " --no-warc-keep-log no emmagatzemes el fitxer de registre en un " "registre WARC.\n" -#: src/main.c:922 +#: src/main.c:931 #, fuzzy msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " @@ -2538,16 +2511,16 @@ msgstr "" " --warc-tempdir=DIRECTORI ubicació per als fitxers temporals creats\n" " per l'escriptor WARC.\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Baixada recursiva:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive baixa de forma recursiva.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2555,7 +2528,7 @@ msgid "" msgstr "" " -l, --level=NOMBRE nivell màxim de recursió (inf o 0 per infinit).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2563,7 +2536,7 @@ msgid "" msgstr "" " --delete-after suprimeix els fitxers locals un cop baixats.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2574,20 +2547,20 @@ msgstr "" "apunten\n" " als fitxers locals.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 #, fuzzy msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr " --warc-cdx escriu fitxers d'índex CDX.\n" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2596,7 +2569,7 @@ msgstr "" " -K, --backup-converted fes una còpia dels fitxers com a X_orig abans\n" " de convertir-los.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2605,7 +2578,7 @@ msgstr "" " -K, --backup-converted fes una còpia dels fitxers com a X.orig abans\n" " de convertir-los.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2614,7 +2587,7 @@ msgstr "" " -m, --mirror opció equivalent -N -r -l inf -no-remove-" "listings.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2623,7 +2596,7 @@ msgstr "" " -p, --page-requisites baixa totes les imatges, etc. necessàries per\n" " veure el document HTML.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2632,11 +2605,11 @@ msgstr "" " --strict-comments activa la gestió estricta (SGML) de comentaris " "HTML.\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Inclusió/exclusió en mode recursiu:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2645,7 +2618,7 @@ msgstr "" " -A, --accept=LLISTA llista separada per comes d'extensions\n" " acceptades.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2654,32 +2627,32 @@ msgstr "" " -R, --reject=LLISTA llista separada per comes d'extensions\n" " rebutjades.\n" -#: src/main.c:964 +#: src/main.c:973 #, fuzzy msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=EXPREG expressió regular que coincideix amb URL\n" " acceptades.\n" -#: src/main.c:966 +#: src/main.c:975 #, fuzzy msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=EXPREG expressió regular que coincideix amb URL\n" " rebutjades.\n" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TIPUS tipus d'expressió regular (posix|pcre).\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE regex type (posix).\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2687,7 +2660,7 @@ msgstr "" " -D, --domains=LLISTA llista separada per comes de dominis\n" " acceptats.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2695,14 +2668,14 @@ msgstr "" " --exclude-domains=LLISTA llista separada per comes de dominis\n" " rebutjats.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp segueix enllaços FTP en documents HTML.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2712,7 +2685,7 @@ msgstr "" "HTML\n" " que es segueixen.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2722,24 +2695,24 @@ msgstr "" "HTML\n" " ignorades.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts segueix enllaços a altres llocs en mode\n" " de recursió.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative només segueix enllaços relatius.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LLISTA llista de directoris acceptats.\n" -#: src/main.c:991 +#: src/main.c:1000 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2749,84 +2722,84 @@ msgstr "" " --trust-server-names empra el nom especificat per l'últim\n" " component de l'URL de la redirecció.\n" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LLISTA llista de directoris rebutjats.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent no ascendeixes al directori pare.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Envieu informes d'error i suggeriments a .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, un baixador de xarxa no interactiu.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Contrasenya per a l'usuari %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Contrasenya: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "no es pot crear una canonada" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contrasenya per a l'usuari %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Construcció: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Enllaç: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2835,29 +2808,29 @@ msgstr "" "GNU Wget %s construït el %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (entorn)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (usuari)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © 2011 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2871,7 +2844,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2879,38 +2852,38 @@ msgstr "" "\n" "Escrit originàriament per Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Envieu informes d'error i preguntes a .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "S'ha produït un problema d'assignació de memòria\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "S'està eixint degut a un error en %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Proveu «%s --help» per a veure més opcions.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: l'opció «-n%c» és il·legal\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "El suport per a depuració no està compilat. S'està descartant el senyalador " "--debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2919,7 +2892,7 @@ msgstr "" "S'ha especificat --no-clober i --convert-links, només s'emprarà --convert-" "links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2928,24 +2901,24 @@ msgstr "" "S'ha especificat --no-clober i --convert-links, només s'emprarà --convert-" "links.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "No es pot donar informació i ser silenciós al mateix temps.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "No té sentit no sobreescriure fitxers i fer marques de temps al mateix " "temps.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "No es pot especificar --inet4-only i --inet6-only a l'hora.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2957,7 +2930,7 @@ msgstr "" "combinació amb -p o -r. Vegeu el manual per a més detalls.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2967,7 +2940,7 @@ msgstr "" "posarà a l'únic fitxer que especifiqueu.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2977,19 +2950,14 @@ msgstr "" "per a més detalls.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "El fitxer «%s» ja existeix, no es baixa.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "L'eixida WARC no funciona amb --no-clobber, s'inhabilitarà --no-clobber.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2997,12 +2965,12 @@ msgstr "" "L'eixida WARC no funciona amb marques de temps, s'inhabilitarà la impressió " "de marques de temps.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "L'eixida WARC no funciona amb --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, fuzzy, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -3010,7 +2978,7 @@ msgid "" msgstr "" "L'eixida WARC no funciona amb --continue o --start-pos, s'inhabilitaran." -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3018,7 +2986,7 @@ msgstr "" "Els resums són inhabilitats; la deduplicació WARC no trobarà registres " "duplicats.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3026,12 +2994,12 @@ msgid "" msgstr "" "L'eixida WARC no funciona amb --continue o --start-pos, s'inhabilitaran." -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "No es pot especificar --ask-password i --password a l'hora.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3040,17 +3008,17 @@ msgstr "" "No és recomanat emprar tant --start-pos i --continue; s'inhabilitarà --" "continue.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta l'URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "No es pot especificar --post-data i --post-file a l'hora.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3059,7 +3027,7 @@ msgstr "" "No podeu emprar --post-data o --post-file amb --method. --method espera les " "dades a través de les opcions --body-data i --body-file" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3068,24 +3036,24 @@ msgstr "" "Heu d'especificar un mètode a través de --method=MètodeHTTP per emprar amb --" "body-data o --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "No es pot especificar --body-data i --body-file a l'hora.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Aquesta versió no implementa IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k només es pot emprar amb -O si es desa la sortida a un fitxer normal.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3093,42 +3061,42 @@ msgid "" msgstr "" "-k només es pot emprar amb -O si es desa la sortida a un fitxer normal.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "No s'ha pogut suprimir l'enllaç simbòlic %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: no s'ha pogut resoldre l'adreça del servidor «%s»\n" -#: src/main.c:2008 +#: src/main.c:2017 #, fuzzy, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "ERROR: No s'ha pogut obrir el certificat %s: (%d).\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "No s'ha trobat cap URL a %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "No s'ha pogut suprimir %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3139,7 +3107,7 @@ msgstr "" "Temps total real: %s\n" "Baixat: %d fitxers, %s en %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "S'ha EXCEDIT la quota de baixada de %s.\n" @@ -3298,107 +3266,107 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "S'està suprimint %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "S'esta continuant en segon terme.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "S'està continuant en segon terme, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "La sortida s'escriurà a %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "Ha fallat fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "Ha fallat fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: No s'ha trobat cap controlador de sòcol usable.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Ha fallat ioctl(). No s'ha pogut establir el sòcol com a blocant.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: avís: el testimoni %s apareix abans que cap nom de màquina.\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: component desconegut \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Forma d'ús: %s NETRC [HOST]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: no s'ha pogut determinar l'estat de %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "AVÃS: s'està utilitzant una llavor aleatòria febla.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "No s'ha pogut donar una llavor al PRNG; considereu emprar --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "La vostra versió d'OpenSSL és massa antiga per suportar TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "La vostra versió d'OpenSSL és massa antiga per suportar TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" "OpenSSL: el valor %d per l'opció «secure-protocol» no està implementat\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: no es pot verificar el certificat de %s, emès per %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " No s'ha pogut verificar localment l'autoritat de l'emetent.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " S'ha trobat un certificat autosignat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " El certificat encara no és vàlid.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " El certificat ha caducat.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3407,7 +3375,7 @@ msgstr "" "%s: cap nom comú alternatiu del certificat concorda\n" "\tamb el nom del servidor demanat %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3415,7 +3383,7 @@ msgstr "" "%s: el nom comú «%s» del certificat no concorda amb el nom del servidor " "demanat %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3426,13 +3394,13 @@ msgstr "" " Això pot ser un indicador de que el servidor no és qui diu que és\n" " (és a dir, no és el %s real).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Per a connectar a %s de manera insegura, useu «--no-check-certificate».\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3441,29 +3409,29 @@ msgstr "" "\n" "%*s[ s'està ometent %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "L'especificació de l'estil de progrés %s no és vàlida; no es canvia.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " en " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "No es pot obtenir la frequència del rellotge en TEMPS REAL: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "S'està suprimint %s ja que no s'hauria de baixar.\n" @@ -3477,24 +3445,24 @@ msgstr "No es pot obrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "S'està llegint el robots.txt; si us plau, ignoreu els errors.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" "S'ha produït un error en analitzar la URL del servidor intermediari %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" "Hi ha un error a la URL del servidor intermediari %s: Ha de ser HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "S'ha excedit el màxim de redireccions (%d).\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3502,7 +3470,7 @@ msgstr "" "S'està abandonant.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3510,128 +3478,128 @@ msgstr "" "S'està reintentant.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Cap error" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "L'esquema %s no està implementat" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Manca l'esquema" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "El nom del servidor és invàlid" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "El número de port és incorrecte" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Nom d'usuari no vàlid" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "L'adreça numèrica IPv6 no està terminada" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Les adreces IPv6 no estan implementades" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "L'adreça numèrica IPv6 no és vàlida" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "La implementació d'HTTPS no s'ha inclòs a la construcció" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "S'ha trobat una seqüència multioctet incompleta o invàlida\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: No s'ha pogut la memòria suficient; s'ha exhaurit la memòria.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: No s'ha pogut assignar %ld octets; s'ha exhaurit la memòria.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: la memòria intermèdia de text és massa gran (%ld octets), " "s'està avortant.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Es continua en segon terme, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "No s'ha pogut suprimir l'enllaç simbòlic %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "No s'ha pogut suprimir l'enllaç simbòlic %s: %s\n" +msgstr "ERROR: No s'ha pogut obrir el certificat %s: (%d).\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "No s'ha pogut obtenir la galeta per a %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "No s'ha pogut obtenir la galeta per a %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: no s'ha pogut resoldre l'adreça del servidor «%s»\n" +msgstr "ERROR: No s'ha pogut obrir el certificat %s: (%d).\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "No s'ha pogut obtenir la galeta per a %s\n" +msgstr "No s'ha pogut suprimir l'enllaç simbòlic %s: %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "L'expressió regular %s no és vàlida, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "S'ha produït un error en la coincidència de %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3717,6 +3685,31 @@ msgstr "" "S'ha trobat la coincidència exacta al fitxer CDX. S'està desant el registre " "de revisita al WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: l'opció «--%s» no admet arguments\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: l'opció «--%s» no és reconeguda\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: l'opció «-W %s» no admet arguments\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: l'opció «-W %s» necessita un argument\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "Ha fallat «idn_decode» (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "S'ha rebut %s.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "El fitxer «%s» ja existeix, no es baixa.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3737,20 +3730,6 @@ msgstr "" #~ "S'han trobat %d enllaços trencats.\n" #~ "\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: L'URL %s no és vàlid: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "Ha fallat «idn_decode» (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "S'ha rebut %s.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Ha fallat l'autorització.\n" diff --git a/po/cs.gmo b/po/cs.gmo index 4d37294..516b016 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 756ee53..86d896e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-17 20:29+01:00\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -27,7 +27,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Neznámá chyba systému" @@ -35,7 +35,7 @@ msgstr "Neznámá chyba systému" msgid "Address family for hostname not supported" msgstr "Adresní rodina není u názvu stroje podporována" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "DoÄasná chyba pÅ™i pÅ™ekladu jména" @@ -103,70 +103,45 @@ msgstr "PÅ™eruÅ¡eno signálem" msgid "Parameter string not correctly encoded" msgstr "ŘetÄ›zec parametru není správnÄ› kódován" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Neznámá chyba" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný, možnosti:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: pÅ™epínaÄ â€ž--%s“ nedovoluje argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný, možnosti:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neznámý pÅ™epínaÄ â€ž%c%s“\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pÅ™epínaÄ â€ž%c%s“ nedovoluje argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: pÅ™epínaÄ â€ž--%s“ vyžaduje argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neznámý pÅ™epínaÄ â€ž--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neznámý pÅ™epínaÄ â€ž%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: chybný pÅ™epínaÄ – „%c“\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pÅ™epínaÄ vyžaduje argument – „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: pÅ™epínaÄ â€ž-W %s“ není jednoznaÄný\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: pÅ™epínaÄ â€ž-W %s“ nedovoluje argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: pÅ™epínaÄ â€ž-W %s“ vyžaduje argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -186,13 +161,13 @@ msgstr "%s: pÅ™epínaÄ â€ž-W %s“ vyžaduje argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -264,28 +239,28 @@ msgstr "Regulární výraz je příliÅ¡ velký" msgid "Unmatched ) or \\)" msgstr "Chybí odpovídající závorka k ) nebo \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Žádný pÅ™edchozí regulární výraz" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "nelze vytvoÅ™it rouru" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "podproces %s selhal" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "voláni _open_osfhandle selhalo" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "nelze obnovit deskriptor %d: volání dup2 selhalo" @@ -305,52 +280,52 @@ msgstr "podproces %s obdržel nepÅ™ekonatelný signál %d" msgid "memory exhausted" msgstr "paměť vyÄerpána" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: adresu pro pÅ™ilepení %s nelze pÅ™eložit, vypínám pÅ™ilepování (bind(2)).\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Navazuje se spojení s %s|%s|:%d… " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Navazuje se spojení s %s:%d… " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Navazuje se spojení s [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "volání setsockopt(SO_RCVBUF) selhalo: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "spojeno.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "nezdaÅ™ilo se: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: adresu poÄítaÄe %s nelze pÅ™eložit\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "volání setsockopt(SO_REUSEADDR) selhalo: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -387,179 +362,179 @@ msgstr "%s nebylo možné smazat: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Nelze zálohovat %s jako %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Pro %s nelze získat cookie\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaktická chyba v hlaviÄce Set-Cookie: %s na pozici %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie pÅ™iÅ¡edÅ¡i z %s se pokusila nastavit doménu na " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Soubor s cookie %s nelze otevřít: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "PÅ™i zápisu do %s nastala chyba: %s.\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "PÅ™i uzavírání %s nastala chyba: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Nepodporovaný typ výpisu, použije se Unixový parser.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Obsah /%s na %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Äas neznámý " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Soubor " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Adresář " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Sym. odkaz " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Neznámý typ " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtů)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Délka: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) zbývá" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s zbývá" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (není smÄ›rodatné)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL nelze inicializovat. Bude zakázáno." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Probíhá pÅ™ihlaÅ¡ování jako %s… " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "" "Řídicí spojení bude ukonÄeno, protože server odpovÄ›dÄ›l chybovým hlášením.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Úvodní odpovÄ›Ä serveru je chybná.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Řídicí spojení bude ukonÄeno, protože nelze zapsat data.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Server odmítá pÅ™ihlášení.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Chyba pÅ™i pÅ™ihlášení.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "PÅ™ihlášeno!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Server nepÅ™ijal příkaz „PBSZ 0“.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Server nepÅ™ijal příkaz „PROT %c“.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "" "Nelze zjistit typ vzdáleného operaÄního systému, protože server odpovÄ›dÄ›l " "chybovým hlášením.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "hotovo. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "hotovo.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "" "Řídicí spojení bude ukonÄeno, protože je požadován neznámý typ pÅ™enosu " "„%c“.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "hotovo." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD není potÅ™eba.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Dosažena logicky nemožná sekce v getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -570,7 +545,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -579,37 +554,37 @@ msgstr "" "Adresář %s neexistuje.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD není potÅ™eba.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Soubor již byl pÅ™enesen.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nelze spustit pasivní pÅ™enos dat.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "OdpovÄ›Ä na PASV není pochopitelná.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "s %s na portu %d se nelze spojit: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Chyba pÅ™i pÅ™ilepování (bind) (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Neplatný PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -617,17 +592,17 @@ msgstr "" "\n" "Příkaz REST selhal, pÅ™enos zaÄne od zaÄátku souboru.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Soubor %s existuje.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Soubor %s neexistuje.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -636,7 +611,7 @@ msgstr "" "Soubor %s neexistuje.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -645,40 +620,40 @@ msgstr "" "Soubor Äi adresář %s neexistuje.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s se objevil.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, řídicí spojení bude ukonÄeno.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) – Datové spojení: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Řídicí spojení bylo ukonÄeno.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "PÅ™enos dat byl pÅ™edÄasnÄ› ukonÄen.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Soubor %s je již přítomen, nebude pÅ™enášen.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -687,7 +662,7 @@ msgstr "" "%s (%s) – zapsáno na standardní výstup %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -696,35 +671,35 @@ msgstr "" "%s (%s) – %s uložen [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Maže se %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Seznam souborů bude doÄasnÄ› uložen v %s.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Soubor %s byl odstranÄ›n.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Hloubka rekurze %d pÅ™ekroÄila maximální hloubku %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Vzdálený soubor není novÄ›jší než lokální soubor %s, a není jej tÅ™eba " "stahovat.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -733,7 +708,7 @@ msgstr "" "Vzdálený soubor je novÄ›jší než lokální soubor %s, a je jej tÅ™eba stáhnout.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -742,11 +717,11 @@ msgstr "" "Velikosti se neshodují (lokální %s), stahuji.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "PÅ™eskakuje se symbolický odkaz, neboÅ¥ název odkazu není platný.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -755,244 +730,244 @@ msgstr "" "Korektní symbolický odkaz %s -> %s již existuje.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Vytváří se symbolický odkaz %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Symbolické odkazy nejsou podporovány, symbolický odkaz %s bude vynechán.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Adresář %s bude vynechán.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: neznámý/nepodporovaný typ souboru.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nastavení práv k souboru „%s“ selhalo.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: Äasové razítko souboru je poruÅ¡ené.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Podadresáře se nebudou pÅ™enášet, protože již bylo dosaženo hloubky %d " "(maximum je %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" "Do adresáře %s se nesestoupí, protože tento adresář se buÄ má vynechat, nebo " "nebyl zadán k procházení.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s se zamítá.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "PÅ™i porovnávání %s s %s doÅ¡lo k chybÄ›: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Vzorku %s nic neodpovídá.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Výpis adresáře v HTML formátu byl zapsán do %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Výpis adresáře v HTML formátu byl zapsán do %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "CHYBA: Adresář %s nelze otevřít.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "CHYBA: Certifikát %s nelze otevřít: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Certifikát certifikaÄní autority „%s“ zaveden\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "CHYBA: Soubor s CRL „%s“ nelze zavést: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Soubor s CRL „%s“ byl zaveden\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "CHYBA: GnuTLS vyžaduje, aby formát souboru a certifikátu byl stejný.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: neimplementovaná hodnota %d volby „secure-protocol“\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" "Prosím, tento problém nahlaste (anglicky) na adresu \n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: neimplementovaná hodnota %d volby „secure-protocol“\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "CHYBA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "VAROVÃNÃ" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nepÅ™edložil žádný certifikát.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikát %s není důvÄ›ryhodný.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certifikát %s nemá známého vydavatele.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikát %s byl odvolán.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Podepisovatel certifikátu %s nebyl certifikaÄní autorita.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Certifikát pro %s byl podepsán pomocí nebezpeÄného algoritmu.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certifikát pro %s jeÅ¡tÄ› nevstoupil v platnost.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikátu pro %s vyprÅ¡ela platnost.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Chyba pÅ™i inicializaci X509 certifikátu: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Žádný certifikát nenalezen\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Chyba pÅ™i rozebírání certifikátu: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certifikát jeÅ¡tÄ› nenabyl platnosti.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certifikátu uplynula doba platnosti\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Jméno vlastníka certifikátu se neshoduje se jménem poÄítaÄe %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "VeÅ™ejný klÃ­Ä se neshoduje s uloženým veÅ™ejným klíÄem!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certifikát musí být typu X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Chyba pÅ™i zpracování seznamu adres.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Neznámé jméno poÄítaÄe" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "PÅ™ekládám %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "selhal: Pro dané jméno neexistuje žádná IPv4/IPv6 adresa.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "selhal: vyprÅ¡el Äasový limit.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Neúplný odkaz %s nelze vyhodnotit.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Neplatné URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Nebylo možné odeslat HTTP požadavek: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Chybí hlaviÄky, pÅ™edpokládám HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1001,11 +976,11 @@ msgstr "" "Soubor %s je již přítomen, nebude pÅ™enášen.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "Funkce gmtime() selhala. Jedná se asi o chybu.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1013,55 +988,55 @@ msgstr "" "ÄŒasový údaj nelze pÅ™evést na formát HTTP. Jako Äas poslední úpravy se požije " "0.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Soubor %s s daty pro BODY chybí: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Využije se existující spojení s [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Využije se existující spojení s %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Chyba pÅ™i Ätení odpovÄ›di od proxy: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "OdpovÄ›Ä serveru má zkomolený stavový řádek" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelování skrz proxy se nezdaÅ™ilo: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Server požaduje neznámý způsob autentizace.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Vybraná autentizace: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Ukládám do: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1070,20 +1045,20 @@ msgstr "" "PÅ™i stahování podpisu:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Z doÄasného souboru se nepodaÅ™ilo naÄíst podpis. PÅ™eskakuje se.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "DoÄasný soubor nebylo možné vytvoÅ™it. Stažení podpisu se pÅ™eskakuje.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Neplatná hodnota pri. PÅ™edpokládá se %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1091,42 +1066,42 @@ msgstr "" "Nebylo možné nalézt algoritmus otisku pÅ™ijatelný pro metalinkové zdroje.\n" "Ignorují se.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Vypínám SSL kvůli chybám, které se vyskytly.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s požadavek odeslán, program Äeká na odpověą " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "NepÅ™iÅ¡la žádná data.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Chyba (%s) pÅ™i Ätení hlaviÄek.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(žádný popis)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "PÅ™esmÄ›rováno na: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "neudáno" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [následuji]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1135,7 +1110,7 @@ msgstr "" "Soubor %s nebyl na serveru zmÄ›nÄ›n. Stažení se vynechává.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1146,7 +1121,7 @@ msgstr "" "Možná byste chtÄ›li pÅ™idat pÅ™epínaÄ --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1156,59 +1131,59 @@ msgstr "" " Soubor je již plnÄ› pÅ™enesen, nebude se nic dÄ›lat.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Délka: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "je ignorována" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varování: HTTP nepodporuje žolíkové znaky.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Aktivován režim pavouka. Kontroluje, zda vzdálený soubor existuje.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nelze zapsat do %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "V pÅ™ijaté hlaviÄce chybí požadovaný atribut.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Autentizace jménem a heslem se nezdaÅ™ila.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Nelze zapsat do souboru WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Nelze zapsat do doÄasného souboru WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Nebylo možné navázat SSL spojení.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nelze smazat (%s).\n" # , c-format -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: PÅ™esmÄ›rování (%d) bez udané nové adresy.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1216,27 +1191,27 @@ msgstr "" "V odpovÄ›di HTTP nebylo možné najít metalinková data. Soubor se stahuje\n" "pomocí HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Nalezeny hlaviÄky metalinku. PÅ™epíná se do režimu metalinku.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdálený soubor neexistuje – slepý odkaz!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Nelze použít Äasová razítka, protože v odpovÄ›di serveru \n" "schází hlaviÄka „Last-modified“.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "ÄŒasové razítko souboru bude ignorováno, protože hlaviÄka \n" "„Last-modified“ obsahuje neplatné údaje.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1245,16 +1220,16 @@ msgstr "" "Soubor na serveru není novÄ›jší než lokální soubor %s – nebude pÅ™enášen.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Velikosti se neshodují (lokální %s), stahuji.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Lokální soubor je starší a vzdálený soubor se proto bude pÅ™enášet.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1264,7 +1239,7 @@ msgstr "" "stahuji.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1272,7 +1247,7 @@ msgstr "" "Vzdálený soubor existuje, ale neobsahuje žádné odkazy – nestahuji.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1281,7 +1256,7 @@ msgstr "" "Vzdálený soubor existuje a možná obsahuje další odkazy,\n" "avÅ¡ak rekurze je vypnuta – nestahuji.\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1289,12 +1264,12 @@ msgstr "" "Vzdálený soubor existuje.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1303,7 +1278,7 @@ msgstr "" "%s (%s) – zapsáno na standardní výstup %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1312,58 +1287,58 @@ msgstr "" "%s (%s) – %s uloženo [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) – Spojení ukonÄeno na bajtu %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) – Chyba pÅ™i Ätení dat na bajtu %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) – Chyba pÅ™i Ätení dat na bajtu %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany „%s“.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus „%s“.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ukazuje na %s, který ale neexistuje.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nelze pÅ™eÄíst %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Chyba v %s na řádku %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaktická chyba v %s na řádku %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Neznámý příkaz %s v %s na řádku %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1375,7 +1350,7 @@ msgstr "" "Prosím, prověřte „%s“\n" "nebo urÄete jiný soubor pomocí --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1386,52 +1361,52 @@ msgstr "" "„%s“\n" "nebo urÄete jiný soubor pomocí --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Varování: Globální i uživatelský wgetrc jsou shodnÄ› uloženy v %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neplatný příkaz --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: Neplatná pravdivostní hodnota %s, použijte „on“ (zapnuto) nebo " "„off“ (vypnuto).\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: Neplatná hodnota %s, použijte „on“ (zapnuto), „off“ (vypnuto) nebo " "„quiet“ (potichu).\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neplatné Äíslo %s\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s lze použít jen jednou\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neplatná hodnota bajtu %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neplatná Äasová perioda %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1440,28 +1415,28 @@ msgstr "" "use-askpass vyžaduje Å™etÄ›zec nebo buÄ nastavenou promÄ›nnou prostÅ™edí\n" "WGET_ASKPASS, nebo SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neplatná hodnota %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka %s\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka WARC %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neplatný druh indikace postupu %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1471,40 +1446,40 @@ msgstr "" " použijte [unix|vms|windows],[lowercase|uppercase],[nocontrol][ascii]\n" " (význam Äesky: [malá|velká písmena], [neřídicí][ASCII].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kódování %s není platné\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "PÅ™evod z %s do %s není podporován\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Zaznamenána neúplná nebo neplatná vícebajtová posloupnost\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Neobsloužená chyba Ä. %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: národní prostÅ™edí není nastaveno\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode selhala (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Nebylo možné pÅ™evést na malá písmena: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1513,17 +1488,17 @@ msgstr "" "\n" "Výstup se pÅ™esmÄ›rovává do %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s: vypínám protokolování\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Použití: %s [PŘEPÃNAÄŒ]… [URL]…\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1532,57 +1507,57 @@ msgstr "" "verze.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Rozjezd:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version zobrazí verzi Wgetu a skonÄí\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help vytiskne tuto nápovÄ›du\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background po spuÅ¡tÄ›ní pÅ™ejde do pozadí\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=PŘÃKAZ provede příkaz jako z „.wgetrc“\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Protokolový a vstupní soubor:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=SOUBOR protokol zapisuje do SOUBORU\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=SOUBOR zprávy pÅ™ipojuje k SOUBORU\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug tiskne mnoho ladicích informací\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug tiskne ladicí informace z Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tichý režim (žádný výstup)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose bude upovídaný (výchozí chování)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1590,7 +1565,7 @@ msgstr "" " -nv, --no-verbose vypne upovídanost, aniž by byl zcela " "zticha\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1598,7 +1573,7 @@ msgstr "" " --report-speed=ZPÅ®SOB datový tok vypisuje daným ZPÅ®SOBEM,\n" " ZPÅ®SOB může být „bits“ (bity)\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1606,7 +1581,7 @@ msgstr "" " -i, --input-file=SOUBOR stáhne URL uvedená v místním nebo\n" " vnÄ›jším SOUBORU\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1614,11 +1589,11 @@ msgstr "" " --input-metalink=SOUBOR stáhne soubory uvedená v místním\n" " metalinkovém SOUBORU.\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html vstupní soubor považuje za HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1627,25 +1602,25 @@ msgstr "" "F)\n" " relativnÄ› vzhledem k URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=SOUBOR urÄuje konfiguraÄní soubor\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config nenaÄte žádný konfiguraÄní soubor\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=SOUBOR důvody zamítnutí URL zapisuje do SOUBORU\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Stahování:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1653,17 +1628,17 @@ msgstr "" " -t, --tries=POÄŒET nastaví POÄŒET opakování (0 znamená " "neomezeno)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused opakuje, i když spojení je odmítnuto\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=SOUBOR dokumenty zapisuje do SOUBORU\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1671,14 +1646,14 @@ msgstr "" " -nc, --no-clobber vynechá stahování, která by pÅ™epsala již\n" " existující soubory\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config nenaÄte žádný konfiguraÄní soubor\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1686,7 +1661,7 @@ msgstr "" " -c, --continue obnoví stahování ÄásteÄnÄ› staženého " "souboru\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1694,11 +1669,11 @@ msgstr "" " --start-pos=POZICE zaÄne stahovat od POZICE (poÄítá se od " "0)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=DRUH vybere druh indikátoru postupu\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1706,7 +1681,7 @@ msgstr "" " --show-progress zobrazí indikátoru postupu ve vÅ¡ech\n" " úrovních upovídanosti\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1716,7 +1691,7 @@ msgstr "" "mají\n" " mladší místní kopii\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1727,7 +1702,7 @@ msgstr "" " If-Modified-Since pÅ™i porovnání Äasu " "souborů\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1735,20 +1710,20 @@ msgstr "" " --no-use-server-timestamps nenastaví Äas místního souboru podle\n" " souboru na serveru\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response tiskne odpovÄ›Ä serveru\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider nestahuje nic\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDY nastaví vÅ¡echny Äasové limity na SEKUNDY\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1756,7 +1731,7 @@ msgstr "" " --dns-servers=ADRESY seznam serverů DNS na dotazy (oddÄ›lené\n" " Äárkou)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1765,34 +1740,34 @@ msgstr "" "(jméno nebo IP)\n" " na tomto stroji\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNDY nastaví limit pro hledání v DNS na " "SEKUND\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEKUNDY nastaví limit pro navázání spojení na " "SEKUND\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEKUNDY nastaví limit pro Ätení na SEKUND\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDY Äeká SEKUND mezi každým stažením\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" " --waitretry=SEKUNDY Äeká 1 až SEKUND mezi opakováním stažení\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1800,15 +1775,15 @@ msgstr "" " --random-wait Äeká od 0,5*WAIT do 1,5*WAIT sekund mezi\n" " staženími\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy explicitnÄ› vypne proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=POÄŒET nastaví kvótu na POÄŒET stažení\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1817,16 +1792,16 @@ msgstr "" "IP)\n" " na tomto stroji\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RYCHLOST omezí rychlost stahování na RYCHLOST\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache zakáže keÅ¡ování DNS odpovÄ›dí\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1834,7 +1809,7 @@ msgstr "" " --restrict-file-names=OS omezí znaky ve jménech souborů na ty,\n" " které dovoluje operaÄní systém OS\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1842,15 +1817,15 @@ msgstr "" " --ignore-case pÅ™i porovnávání jmen souborů/adresářů\n" " nebere zÅ™etel na velikost písmen\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only pÅ™ipojuje se jen na IPv4 adresy\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only pÅ™ipojuje se jen na IPv6 adresy\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1860,24 +1835,24 @@ msgstr "" " RODINY („IPv6“, „IPv4“ nebo " "„none“ (žádná))\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=UŽIVATEL nastaví pÅ™ihlaÅ¡ovací jméno uživatele\n" " pro FTP i pro HTTP na UŽIVATELE\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=HESLO nastaví heslo pro FTP i pro HTTP na " "HESLO\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password ptá se na hesla\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1894,30 +1869,30 @@ msgstr "" "WGET_ASKPASS\n" " a SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri vypne podporu IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KÓDOVÃNà jako místní kódování IRI použije " "KÓDOVÃNÃ\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KÓDOVÃNà jako implicitní vzdálené kódování se\n" " použije KÓDOVÃNÃ\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink odstraní soubor pÅ™ed jeho pÅ™episem\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1925,7 +1900,7 @@ msgstr "" " --keep-badhash ponechá soubory se Å¡patným kontrolním\n" " souÄtem (pÅ™ipojí .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1933,7 +1908,7 @@ msgstr "" " --metalink-index=ÄŒÃSLO poÅ™adové Äíslo v metaURL metalinku\n" " application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1941,7 +1916,7 @@ msgstr "" " --metalink-over-http použije metalinková metadata z hlaviÄek\n" " odpovÄ›di HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1949,7 +1924,7 @@ msgstr "" " --preferred-location preferované umístÄ›ní metalinkových " "zdrojů\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1957,33 +1932,33 @@ msgstr "" " --no-xattr neukládá metadata do rozšířených " "atributů\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Adresáře:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nevytváří adresáře\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vynutí vytváření adresářů\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories nevytváří adresáře se jmény poÄítaÄů\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories použije jméno protokolu v adresářích\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=CESTA uloží soubory do CESTA/…\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1991,25 +1966,25 @@ msgstr "" " --cut-dirs=POÄŒET ignoruje POÄŒET vzdálených adresářových\n" " komponent\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "PÅ™epínaÄe pro HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=UŽIVATEL nastaví pÅ™ihlaÅ¡ovací jméno uživatele\n" " pro HTTP na UŽIVATELE\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HESLO nastaví heslo pro HTTP na HESLO\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache zakáže keÅ¡ování na stranÄ› serveru\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2017,7 +1992,7 @@ msgstr "" " --default-page=NÃZEV zmÄ›ní výchozí název stránky (běžnÄ›\n" " to je „index.html“)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2025,42 +2000,42 @@ msgstr "" " -E, --adjust-extension HTML/CSS dokumenty ukládá s patÅ™iÄnou\n" " příponou\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignoruje hlaviÄku „Content-Length“\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ŘETÄšZEC ke hlaviÄkám pÅ™idá ŘETÄšZEC\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=DRUH vybere druh indikátoru postupu\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximum pÅ™esmÄ›rování povolených na " "stránku\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UŽIVATEL nastaví UŽIVATELE jako pÅ™ihlaÅ¡ovací " "jméno\n" " k proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=HESLO nastaví HESLO k proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2068,11 +2043,11 @@ msgstr "" " --referer=URL zahrne hlaviÄku „Referer: URL“ do HTTP\n" " požadavku\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers hlaviÄky HTTP uloží do souboru\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2080,36 +2055,36 @@ msgstr "" " -U, --user-agent=AGENT identifikuje se jako AGENT místo Wget/" "VERZE\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" " --no-http-keep-alive zakáže HTTP keep-alive (trvalá spojení)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nepoužije cookies\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=SOUBOR pÅ™ed relací naÄte cookies ze SOUBORU\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=SOUBOR po relaci uloží cookies do SOUBORU\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" " --keep-session-cookies naÄte a uloží cookies relace (netrvalé)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2117,19 +2092,19 @@ msgstr "" " --post-data=ŘETÄšZEC použije metodu POST, jako data poÅ¡le " "ŘETÄšZEC\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=SOUBOR použije metodu POST, poÅ¡le obsah SOUBORU\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=METODA_HTTP v požadavku použije HTTP_METODOU\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2137,14 +2112,14 @@ msgstr "" " --body-data=ŘETÄšZEC jako data poÅ¡le ŘETÄšZEC, --method JE " "nutný\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" " --body-file=SOUBOR poÅ¡le obsah SOUBORU, --method JE nutný\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2155,14 +2130,14 @@ msgstr "" "v úvahu\n" " hlaviÄku Content-Disposition (POKUSNÉ)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error po chybÄ› serveru vypíše pÅ™ijatý obsah\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2173,11 +2148,11 @@ msgstr "" "by\n" " nejprve poÄkal na výzvu od serveru\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "PÅ™epínaÄe HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2188,41 +2163,41 @@ msgstr "" "auto,\n" " SSLv2, SSLv3, TLSv1 a PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only následuje pouze bezpeÄné HTTPS odkazy\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate neověřuje certifikát serveru\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=SOUBOR soubor s certifikátem klienta\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=DRUH druh certifikátu klienta: PEM nebo DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=SOUBOR soubor se soukromým klíÄem\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=DRUH druh soukromého klíÄe: PEM nebo DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=SOUBOR soubor se sbírkou certifikaÄních autorit\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2230,13 +2205,13 @@ msgstr "" " --ca-directory=ADRESÃŘ adresář obsahující hashe jmen\n" " certifikaÄních autorit\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=SOUBOR soubor se sbírkou seznamů odvolaných\n" " certifikátů\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2252,7 +2227,7 @@ msgstr "" " a které jsou oddÄ›leny znakem „;“, proti\n" " kterým se ověřuje protistrana\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2260,7 +2235,7 @@ msgstr "" " --random-file=SOUBOR soubor s náhodnými daty pro zdroj " "SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2268,15 +2243,15 @@ msgstr "" " --egd-file=SOUBOR soubor jmenující socket EGD s náhodnými " "daty\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "PÅ™epínaÄe pro HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts zakáže HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2284,11 +2259,11 @@ msgstr "" " --hsts-file cesta k databázi HSTS (pÅ™ebije výchozí\n" " chování)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "PÅ™epínaÄe FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2297,35 +2272,35 @@ msgstr "" "binární\n" " FTP soubory\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=UŽIVATEL nastaví pÅ™ihlaÅ¡ovací jméno pro FTP na\n" " UŽIVATELE\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HESLO nastaví heslo pro FTP na HESLO\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neodstraňuje soubory „.listing“\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob neexpanduje jména FTP souborů\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp zakáže pasivní režim pÅ™enosu\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachová přístupová práva ze serveru\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2334,11 +2309,11 @@ msgstr "" "ne),\n" " na které odkazuje symbolický odkaz\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "PÅ™epínaÄe pro FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2347,7 +2322,7 @@ msgstr "" "port\n" " je 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2359,7 +2334,7 @@ msgstr "" "spojení\n" " řídicího.\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2367,7 +2342,7 @@ msgstr "" " --ftps-clear-data-connection Å¡ifruje pouze řídicí spojení,\n" " data Å¡ifrována nebudou\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2375,11 +2350,11 @@ msgstr "" " --ftps-fallback-to-ftp není-li FTPS podporováno cílovým\n" " serverem, pÅ™ejde se na FTP\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "PÅ™epínaÄe WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2387,12 +2362,12 @@ msgstr "" " --warc-file=SOUBOR uloží požadavek/odpovÄ›Ä do souboru .warc." "gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=ŘETÄšZEC do záznamu WARC pÅ™idá ŘETÄšZEC\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" @@ -2400,11 +2375,11 @@ msgstr "" "na\n" " ÄŒÃSLO\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapíše indexové soubory CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2412,22 +2387,22 @@ msgstr "" " --warc-dedup=SOUBOR neukládá záznamy uvedené v tomto souboru " "CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression nekomprimuje soubory WARC gzipem\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests nepoÄítá kontrolní souÄty SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr " --no-warc-keep-log neuloží protokol do záznamu WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2436,15 +2411,15 @@ msgstr "" " --warc-tempdir=ADRESÃŘ umístÄ›ní doÄasných souborů vytvářených\n" " zapisovatelem WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekurzivní stahování:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive zapne rekurzivní stahování\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2452,7 +2427,7 @@ msgstr "" " -l, --level=POÄŒET maximální hloubka rekurze\n" " („inf“ nebo „0“ pro nekoneÄno)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2460,7 +2435,7 @@ msgstr "" " --delete-after smaže soubory lokálnÄ› po té, co dokonÄí\n" " jejich stahování\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2470,7 +2445,7 @@ msgstr "" "na\n" " místní soubory\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2478,7 +2453,7 @@ msgstr "" " --convert-file-only pÅ™evede pouze Äást URL se souborem " "(basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2486,7 +2461,7 @@ msgstr "" " --backups=N pÅ™ed zápisem souboru X odrotuje až N\n" " záložních souborů\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2494,7 +2469,7 @@ msgstr "" " -K, --backup-converted pÅ™ed konverzí souboru X jej zazálohuje\n" " jako X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2502,7 +2477,7 @@ msgstr "" " -K, --backup-converted pÅ™ed konverzí souboru X jej zazálohuje\n" " jako X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2510,7 +2485,7 @@ msgstr "" " -m, --mirror zkratka pro -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2518,7 +2493,7 @@ msgstr "" " -p, --page-requisites získá vÅ¡echny obrázky apod. potÅ™ebné pro\n" " zobrazení HTML stránky\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2526,64 +2501,64 @@ msgstr "" " --strict-comments zapne přísné zacházení s HTML komentáři\n" " podle SGML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekurzivní povolení/zakázání:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" " -A, --accept=SEZNAM Äárkou oddÄ›lený seznam povolených přípon\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" " -R, --reject=SEZNAM Äárkou oddÄ›lený seznam zakázaných přípon\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGULÃRNÃ_VÃRAZ\n" " regulární výraz pÅ™ijímající URL\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGULÃRNÃ_VÃRAZ\n" " regulární výraz zamítající URL\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=DRUH druh regulárních výrazů (posix, pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=DRUH druh regulárních výrazů (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=SEZNAM Äárkou oddÄ›lený seznam povolených domén\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=SEZNAM Äárkou oddÄ›lený seznam zakázaných domén\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp následuje FTP odkazy z HTML dokumentů\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2592,7 +2567,7 @@ msgstr "" "urÄených\n" " k následování\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2600,22 +2575,22 @@ msgstr "" " --ignore-tags=SEZNAM        Äárkou oddÄ›lený seznam ignorovaných HTML\n" " znaÄek\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts pÅ™i rekurzi pÅ™echází i na jiné poÄítaÄe\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative následuje jen relativní odkazy\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=SEZNAM\n" " seznam povolených adresářů\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2624,18 +2599,18 @@ msgstr "" " --trust-server-names použije se jméno z poslední Äásti\n" " pÅ™esmÄ›rovávajícího URL\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=SEZNAM\n" " seznam zakázaných adresářů\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent nestoupá do nadÅ™azeného adresáře\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Zprávy o chybách a návrhy na vylepÅ¡ení programu zasílejte na adresu\n" @@ -2643,68 +2618,68 @@ msgstr "" "zasílejte na adresu .\n" # , c-format -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, program pro neinteraktivní stahování souborů.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Heslo uživatele %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Heslo: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Nelze vytvoÅ™it rouru\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Chyba pÅ™i inicializaci akcí souboru s příkazy pro use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Chyba pÅ™i nastavování akcí souboru s příkazy pro use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Chyba pÅ™i Ätení odpovÄ›di z příkazu „%s %s“: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Uživatelské jméno pro „%s%s“: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Heslo pro „%s%s@%s“: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc:" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Národní prostÅ™edí: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "PÅ™eloženo: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Slinkováno: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2713,29 +2688,29 @@ msgstr "" "GNU Wget %s sestaven na systému %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (prostÅ™edí)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (uživatelský)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (globální)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2749,7 +2724,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2757,41 +2732,41 @@ msgstr "" "\n" "Původním autorem tohoto programu je Hrvoje NikÅ¡ić .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Chybová hlášení a dotazy zasílejte na adresu (pouze\n" "anglicky). Komentáře k Äeskému pÅ™ekladu zasílejte na adresu\n" ".\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problém s alokací pamÄ›ti\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "KonÄí se kvůli chybÄ› v %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Příkaz „%s --help“ vypíše další pÅ™epínaÄe.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nepřípustný pÅ™epínaÄ – „-n%c“\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Podpora pro ladÄ›ní nebyla pÅ™i pÅ™ekladu zahrnuta. PÅ™epínaÄ --debug se " "ignoruje.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2800,7 +2775,7 @@ msgstr "" "Jak --no-clobber, tak --convert-links byly zadány. Použije se jen\n" "pÅ™epínaÄ --convert-links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2809,22 +2784,22 @@ msgstr "" "Jak --no-clobber, tak --convert-file-only byly zadány. Použije se jen\n" "pÅ™epínaÄ --convert-file-only.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Program nemůže být upovídaný a zticha zároveň.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Nelze používat Äasová razítka a nemazat pÅ™itom staré soubory.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "--inet4-only a --inet6-only nelze zadat najednou.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2835,7 +2810,7 @@ msgstr "" "více URL nebo je-li zadán pÅ™epínaÄ -p nebo -r. VysvÄ›tlení naleznete " "v manuálu.\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2845,7 +2820,7 @@ msgstr "" "uložen do jediného souboru, který jste urÄili.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2855,12 +2830,7 @@ msgstr "" "v manuálu.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Soubor „%s“ je již zde, nebudu jej pÅ™enášet.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2868,7 +2838,7 @@ msgstr "" "Výstup do WARC nefunguje spolu s --no-clobber. PÅ™epínaÄ --no-clobber bude\n" "vypnut.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2876,12 +2846,12 @@ msgstr "" "Výstup do WARC nefunguje spolu s porovnáváním Äasů. Porovnávání Äasů bude\n" "vypnuto.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Výstup do WARC nefunguje spolu s pÅ™epínaÄem --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2890,7 +2860,7 @@ msgstr "" "Výstup do WARC nefunguje spolu s --continue nebo --start-pos. PÅ™epínaÄe\n" "budou vypnuty.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2899,7 +2869,7 @@ msgstr "" "opakující\n" "se záznamy.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2908,12 +2878,12 @@ msgstr "" "Výstup do WARC nefunguje spolu s --continue nebo --start-pos. PÅ™epínaÄe\n" "budou vypnuty.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "--ask-password a --password nelze zadat najednou.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2922,17 +2892,17 @@ msgstr "" "NedoporuÄuje se uvádÄ›t jak --start-pos, tak --continue. PÅ™epínaÄ --continue\n" "bude vypnut.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: chybí URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "PÅ™epínaÄe --post-data a --post-file nelze zadat najednou.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2942,7 +2912,7 @@ msgstr "" "method. PÅ™epínaÄ --method oÄekává data skrze pÅ™epínaÄe --body-data a --body-" "file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2951,17 +2921,17 @@ msgstr "" "Abyste mohli použít pÅ™epínaÄe --body-data nebo --body-file, je tÅ™eba zvolit " "metody skrze --method=METODA_HTTP.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "PÅ™epínaÄe --body-data a --body-file nelze zadat najednou.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tato verze neobsahuje podporu pro IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2969,7 +2939,7 @@ msgstr "" "PÅ™epínaÄ -k nebo -r lze použít spolu s -O pouze tehdy, je-li výstupem\n" "obyÄejný soubor.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2978,42 +2948,42 @@ msgstr "" "PÅ™epínaÄe --convert-links nebo --convert-file-only lze použít spolu pouze\n" "tehdy, je-li výstupem obyÄejný soubor.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Nebylo možné inicializovat knihovnu libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nebylo možné inicializovat kanál knihovny c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP adresu „%s“ nebylo možné rozebrat\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Nebylo možné nastavit DNS server(y) „%s“ (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "V souboru „%s“ nebyla nalezena žádná URL.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Metalinkový soubor %s nebylo možné rozebrat.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ne vÅ¡echny zdroje bylo možné stáhnout z %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3024,7 +2994,7 @@ msgstr "" "Celkový skuteÄný Äas: %s\n" "Staženo: %d souborů, %s za %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Kvóta %s na stahování PŘEKROÄŒENA!\n" @@ -3180,44 +3150,44 @@ msgstr "Soubor %s byl získán, ale podpis nesouhlasí.\n" msgid "Renaming %s to %s.\n" msgstr "PÅ™ejmenovává se %s na %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Program pokraÄuje v bÄ›hu na pozadí.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Program pokraÄuje v bÄ›hu na pozadí, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Výstup bude zapsán do %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "volání fake_fork_child() selhalo\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "volání fake_fork() selhalo\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nelze najít použitelný ovladaÄ soketů.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "Volání ioctl() selhalo. Socket nebylo možné pÅ™epnout do neblokujícího " "režimu.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" @@ -3225,64 +3195,64 @@ msgstr "" "poÄítaÄe\n" # TODO: msgid bug: explicit quotation -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznámý token „%s“\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Použití: %s NETRC [NÃZEV POÄŒÃTAÄŒE]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: volání „stat %s“ skonÄilo chybou: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "VAROVÃNÃ: používám slabý zdroj náhodných Äísel.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "PRNG nelze zinicializovat, zvažte použití pÅ™epínaÄe --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "VaÅ¡e verze OpenSSL je příliÅ¡ stará, aby podporovala TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "VaÅ¡e verze OpenSSL je příliÅ¡ stará, aby podporovala TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d volby „secure-protocol“\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: certifikát pro %s vydaný %s nelze ověřit:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Autoritu vydavatele nelze lokálnÄ› ověřit.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Nalezen certifikát podepsaný sám sebou.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Vydaný certifikát jeÅ¡tÄ› nenabyl platnosti.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Vydanému certifikátu uplynula doba platnosti.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3291,7 +3261,7 @@ msgstr "" "%s: žádné alternativní jméno z certifikátu se neshoduje\n" "\ts požadovaným jménem poÄítaÄe %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3299,7 +3269,7 @@ msgstr "" " %s: obecné jméno (CN) certifikátu %s se neshoduje s požadovaným jménem " "poÄítaÄe %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3310,12 +3280,12 @@ msgstr "" " To může ukazovat na to, že stroj není tím, za koho se vydává (to jest,\n" " ve skuteÄnosti to není %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Pro nezabezpeÄené spojení s %s použijte „--no-check-certificate“.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3324,28 +3294,28 @@ msgstr "" "\n" "%*s[ pÅ™eskakuje se %s K ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "%s není platné urÄení způsobu indikace, ponecháno nezmÄ›nÄ›no.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " zbývá %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " za " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Frekvenci hodin REÃLNÉHO ÄŒASU nelze urÄit: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Maže se %s, protože tento soubor není požadován.\n" @@ -3359,22 +3329,22 @@ msgstr "%s nelze otevřít: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄítá se „robots.txt“. Chybová hlášení ignorujte, prosím.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba rozebírání URL proxy serveru %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Chyba v URL Proxy %s: Musí být HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "PÅ™ekroÄeno %d pÅ™esmÄ›rování.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3382,7 +3352,7 @@ msgstr "" "Ani poslední pokus nebyl úspěšný.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3390,127 +3360,127 @@ msgstr "" "Zkusí se to znovu.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Bez chyby" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nepodporované schéma %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Chybí schéma" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Neplatné jméno stroje" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Chybné Äíslo portu" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Neplatné jméno uživatele" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "NeukonÄená Äíselní IPv6 adresa" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adresy nejsou podporovány" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Chybná Äíselná IPv6 adresa" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Podpora HTTPS nebyla zakompilována do programu" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Zaznamenána neúplná nebo neplatná vícebajtová posloupnost\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: NezdaÅ™ilo se alokovat dostatek pamÄ›ti, paměť vyÄerpána.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: alokace %ld bajtů selhala, paměť vyÄerpána.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: vyrovnávací paměť pro text je příliÅ¡ velká (%d bajtů), " "pÅ™eruÅ¡eno.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Program pokraÄuje v bÄ›hu na pozadí. pid %d\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nebylo možné odstranit symbolický odkaz %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Nebylo možné inicializovat knihovnu libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nastavení práv k souboru „%s“ selhalo.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Nastavení práv k souboru „%s“ selhalo.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "IP adresu „%s“ nebylo možné rozebrat\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Nastavení práv k souboru „%s“ selhalo.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Neplatný regulární výraz %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "PÅ™i porovnávání %s nastala chyba: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3598,6 +3568,24 @@ msgstr "" "Nalezena pÅ™esná shoda v souboru CDX. Ukládá se záznam o opakované návÅ¡tÄ›vÄ› " "do WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: pÅ™epínaÄ â€ž--%s“ nedovoluje argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neznámý pÅ™epínaÄ â€ž--%s“\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: pÅ™epínaÄ â€ž-W %s“ není jednoznaÄný\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: pÅ™epínaÄ â€ž-W %s“ nedovoluje argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: pÅ™epínaÄ â€ž-W %s“ vyžaduje argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Soubor „%s“ je již zde, nebudu jej pÅ™enášet.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/da.gmo b/po/da.gmo index d4417ef..935f8ef 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 58b8d14..72f4d00 100644 --- a/po/da.po +++ b/po/da.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.12-pre7\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2011-01-09 07:03+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -22,7 +22,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -31,7 +31,7 @@ msgstr "Ukendt systemfejl" msgid "Address family for hostname not supported" msgstr "IPv6-adresser understøttes ikke" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Midlertidig fejl i navneevaluering" @@ -102,70 +102,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ukendt fejl" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaget '%s' er flertydig\n" -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flaget '%s' er flertydig\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: flaget '--%s' tillader ikke et argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: ukendt flag '%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaget '%c%s' tillader ikke et argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaget '--%s' kræver et argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: ukendt flag '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: ukendt flag '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldigt flag -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaget kræver et argument -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: flaget '-W %s' er flertydigt\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: flaget '-W %s' tillader ikke et argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: flaget '%s' kræver et argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -185,13 +160,13 @@ msgstr "%s: flaget '%s' kr #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "'" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -267,28 +242,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -307,51 +282,51 @@ msgstr "" msgid "memory exhausted" msgstr "hukommelse opbrugt" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: kan ikke evaluere bindingsadressen %s; deaktiverer binding.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Tilslutter %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Tilslutter %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "Tilslutter %s:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "forbundet.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "mislykkedes: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kan ikke evaluere værtsadresse %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -385,174 +360,174 @@ msgstr "Kan ikke slette %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Kan ikke sikkerhedskopiere %s som %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Kan ikke slette %s: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaksfejl i Set-Cookie: %s på position %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie, der kommer fra %s, forsøgte at sætte domæne til %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Kan ikke åbne cookiefil %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Fejl ved skrivning til %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Fejl ved lukning af %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Ikke-understøttet listningstype, prøver Unix-listningsfortolker.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks for /%s på %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "ukendt tid " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fil " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Katalog " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Usikker " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Længde: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) resterende" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s resterende" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (ikke endegyldigt)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Logger ind som %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Fejl i svar fra server, lukker kontrolforbindelsen.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Fejl i velkomsthilsen fra server.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Fejl ved skrivning, lukker kontrolforbindelsen.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Serveren tillader ikke indlogning.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Fejl ved indlogning.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Logget ind!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Serverfejl, kan ikke bestemme systemtype.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "færdig. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "O.k.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Ukendt type '%c', lukker kontrolforbindelsen.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "O.k. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD ikke nødvendig.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -560,7 +535,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -569,37 +544,37 @@ msgstr "" "Intet katalog ved navn %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ikke nødvendig.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Fil er allerede blevet hentet.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Kan ikke opsætte PASV-overførsel.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Kan ikke tolke PASV-tilbagemelding.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "kunne ikke forbinde til %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind-fejl (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ugyldig PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -607,17 +582,17 @@ msgstr "" "\n" "Fejl ved REST, starter forfra.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Filen %s findes.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Ingen fil ved navn %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -626,7 +601,7 @@ msgstr "" "Ingen fil ved navn %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -635,40 +610,40 @@ msgstr "" "Ingen fil eller katalog ved navn %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s er opstået.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, lukker kontrolforbindelsen.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - dataforbindelse: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Forbindelsen lukket.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Dataoverførsel afbrudt.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Filen %s findes allerede, hentes ikke.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(forsøg:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -677,7 +652,7 @@ msgstr "" "%s (%s) - skrevet til standard-udata %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -686,34 +661,34 @@ msgstr "" "%s (%s) - %s gemt [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" # listing?? -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Bruger %s som midlertidig listefil.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Slettede %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Rekursionsdybde %d overskred maksimal dybde %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Fjernfil ikke nyere end lokal fil %s -- hentes ikke.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -722,18 +697,18 @@ msgstr "" "Fjernfil er nyere end lokal fil %s -- hentes.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "Størrelserne er forskellige (lokal %s) -- hentes.\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ugyldigt navn for symbolsk lænke, ignoreres.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -742,373 +717,373 @@ msgstr "" "Har allerede gyldig symbolsk lænke %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Laver symbolsk lænke %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Symbolske lænker understøttes ikke, ignorerer den symbolske lænke %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ignorerer katalog %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: filtypen er ukendt/ikke understøttet.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Kunne ikke få certifikatnøgle fra %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: ugyldigt tidsstempel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Henter ikke kataloger, da dybde er %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Behandler ikke %s, da det er ekskluderet/ikke inkluderet.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Afviser %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fejl ved sammenligning af %s med %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ingen træffere med mønsteret %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Skrev HTML-formateret indeks til %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Skrev HTML-formateret indeks til %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FEJL: Kan ikke åbne katalog %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, fuzzy, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEJL: Kan ikke åbne katalog %s.\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Rapportér venligst fejl og send spørgsmål til .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "FEJL" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "ADVARSEL" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Intet certifikat præsenteret af %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikatet for %s er ikke betroet.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certifikatet for %s har ingen kendt udsteder.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Certifikatet for %s er ikke betroet.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, fuzzy, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Certifikatet for %s har ingen kendt udsteder.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certifikatet for %s er ikke betroet.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikatet for %s er blevet tilbagekaldt.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fejl ved initialisering af X509-certifikat: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Intet certifikat fundet\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fejl ved fortolkning af certifikat: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certifikatet er endnu ikke blevet aktiveret\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certifikatet er udløbet\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Certifikatets ejer svarer ikke til værtsnavnet %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ukendt vært" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Løser %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "mislykkedes: Ingen IPv4/IPv6-adresser for vært.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "mislykkedes: tiden udløb.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: kan ikke løse ukomplet lænke %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ugyldig URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Fejl ved skrivning af HTTP-forespørgsel: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Ingen toptekster, antager HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Filen %s findes allerede, hentes ikke.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "POST-datafil %s mangler: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Genbruger eksisterende forbindelse til %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fejl ved læsning af svar fra proxy: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEJL %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Forkert udformet statuslinje" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxytunnel slog fejl: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ukendt autorisations-protokol.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Ukendt autorisations-protokol.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Gemmer til: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Deaktiverer SSL, da der opstod fejl.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s forespørgsel sendt, afventer svar... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ingen data modtaget\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Læsefejl (%s) i toptekster.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(ingen beskrivelse)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Sted: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "uspecificeret" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [omdirigeret]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1116,7 +1091,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1126,82 +1101,82 @@ msgstr "" " Filen er allerede fuldt overført; ingen handling nødvendig.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Længde: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignoreret" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn ikke understøttet i HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Edderkoptilstand aktiveret. Kontrollér om fjernfilen findes.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Kunne ikke etablere SSL-forbindelse.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan ikke skrive til %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEJL: Omdirigering (%d) uden nyt sted.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fjernfilen findes ikke -- ødelagt henvisning!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified toptekst mangler -- tidsstempling slås fra.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified toptekst ugyldig -- tidsstempel ignoreret.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1210,16 +1185,16 @@ msgstr "" "Serverfil ikke nyere end lokal fil %s -- hentes ikke.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Størrelserne er forskellige (lokal %s) -- hentes.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Fil på server er nyere - hentes.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1229,7 +1204,7 @@ msgstr "" "henter.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1237,7 +1212,7 @@ msgstr "" "Fjernfil findes, men indeholder ingen henvisninger -- henter ikke.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1247,7 +1222,7 @@ msgstr "" "men rekursion er deaktiveret - henter ikke.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1255,12 +1230,12 @@ msgstr "" "Fjernfilen findes.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1269,7 +1244,7 @@ msgstr "" "%s (%s) - skrevet til standard-uddata %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1278,59 +1253,59 @@ msgstr "" "%s (%s) - %s gemt [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Forbindelse lukket ved byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Læsefejl ved byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Læsefejl ved byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" # scheme? -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ikke-understøttet skema %s" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC peger på %s, som ikke findes.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan ikke læse %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fejl i %s på linje %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksfejl i %s på linje %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ukendt kommando %s i %s på linje %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1338,7 +1313,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1346,75 +1321,75 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Advarsel: Både systemets og brugerens wgetrc peger på %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ugyldig kommando %s til --execute\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ugyldig boolesk variabel %s; brug 'on' eller 'off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Ugyldig boolesk variabel %s; brug 'on' eller 'off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ugyldigt tal %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ugyldig byteværdi %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ugyldig tidsperiode %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ugyldig værdi %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ugyldig toptekst %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ugyldig toptekst %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ugyldig fremskridtstype %s\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1423,40 +1398,40 @@ msgstr "" "%s: %s: Ugyldig restriktion %s,\n" " brug [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodningen %s er ikke gyldig\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konvertering fra %s til %s understøttes ikke\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Ubehandlet fejlnr %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: regionsinformation (locale) er ikke angivet\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode mislykkedes (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "kunne ikke forbinde til %s port %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1465,17 +1440,17 @@ msgstr "" "\n" "%s modtaget, omdirigerer udskrift til %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deaktiverer logning.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Brug: %s [FLAG]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1483,70 +1458,70 @@ msgstr "" "Obligatoriske argumenter til lange flag er obligatoriske også for korte.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Opstart:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version vis versionen af Wget og afslut.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help udskriv denne hjælp.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background gå i baggrunden efter opstart.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=KOMMANDO kør en kommando i stil med '.wgetrc'.\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Logning og inddatafil:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FIL log meddelelser til FIL.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FIL tilføj meddelelser til FIL.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug udskriv masser af fejlsøgningsinformation.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug udskriv Watt-32-fejlsøgningsinformation.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stilhed (ingen udskrift).\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose uddybende udskrift (dette er standardvalget).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1554,13 +1529,13 @@ msgid "" msgstr "" " -nv, --no-verbose være mindre uddybende, men ikke helt stille.\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1568,7 +1543,7 @@ msgid "" msgstr "" " -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1576,12 +1551,12 @@ msgid "" msgstr "" " -i, --input-file=FILE hent URL'er fra den lokale eller eksterne FIL.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandl inddatafilen som HTML.\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1591,26 +1566,26 @@ msgstr "" "F)\n" " relativt til URL.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1619,19 +1594,19 @@ msgstr "" " -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " "ubegrænset)\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused forsøg igen selv hvis forbindelse nægtes.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL skriv dokumenter til FIL.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1640,14 +1615,14 @@ msgstr "" " -nc, --no-clobber hent ikke filer, der ville blive lagret på\n" " eksisterende filer.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies brug ikke cookies.\n" +msgstr " -np, --no-parent gå ikke op til ophavskataloget.\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1655,25 +1630,25 @@ msgid "" msgstr "" " -c, --continue genoptag hentning af en delvis hentet fil.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1684,14 +1659,14 @@ msgstr "" "nyere\n" " end den lokale.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1700,30 +1675,30 @@ msgstr "" " --no-use-server-timestamps sæt ikke den lokale fils tidsstempel til\n" " den på serveren.\n" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response udskriv svar fra server.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider hent intet.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDER sæt alle værdier for tidsudløb til " "SEKUNDER.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1733,31 +1708,31 @@ msgstr "" "lokal\n" " vært.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNDER sæt tidsudløb for DNS-opslag til SEKUNDER\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEKUNDER sæt tidsudløb for forbindelse til " "SEKUNDER.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEKUNDER sæt tidsudløb for læsning til SEKUNDER.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDER vent SEKUNDER mellem hentninger.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1767,7 +1742,7 @@ msgstr "" "på\n" " at hente.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1776,17 +1751,17 @@ msgstr "" " --random-wait vent fra 0,5*VENT til 1,5*VENT sekunder " "mellem hentninger.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy slå proxy fra eksplicit.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=ANTAL sæt hentningskvote til ANTAL.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1796,18 +1771,18 @@ msgstr "" "lokal\n" " vært.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=HASTIGHED begræns downloadhastighed til HASTIGHED.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache deaktivér cache for DNS-opslag.\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1817,7 +1792,7 @@ msgstr "" "tillades\n" " af operativsystemet.\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1826,17 +1801,17 @@ msgstr "" " --ignore-case ingen forskel på store/små bogstaver ved\n" " matching af filer/kataloger\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only forbind kun til IPv4-adresser.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only forbind kun til IPv6-adresser.\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1846,13 +1821,13 @@ msgstr "" " --prefer-family=FAMILIE forbind først til adresser i den angivne\n" " familie, enten IPv6, IPv4, eller none.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=BRUGER angiv både ftp- og http-bruger til BRUGER.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" @@ -1860,12 +1835,12 @@ msgstr "" " --password=KODE angiv både ftp- og http-adgangskode til " "KODE.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password bed om adgangskoder.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1876,19 +1851,19 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri slå understøttelse af IRI fra.\n" -#: src/main.c:714 +#: src/main.c:723 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KODNING brug KODNING som lokal kodning for IRI'er\n" -#: src/main.c:716 +#: src/main.c:725 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1896,73 +1871,72 @@ msgstr "" " --remote-encoding=KODNING brug KODNING som standardfjernkodning.\n" # glob er f.eks. når man skriver *.txt, og skallen svarer med fil1.txt, fil2.txt, ... -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-glob slå globning af FTP-filnavne fra.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" -msgstr " -Q, --quota=ANTAL sæt hentningskvote til ANTAL.\n" +msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-iri slå understøttelse af IRI fra.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Kataloger:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories opret ikke kataloger.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tving oprettelse af kataloger.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories opret ikke værtskataloger.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories brug protokolnavn i kataloger.\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PRÆFIKS gem filer til PRÆFIKS/...\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1971,26 +1945,26 @@ msgstr "" " --cut-dirs=ANTAL ignorér ANTAL komponenter for " "fjernkataloger\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-flag:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=BRUGER sæt http-brugeren til BRUGER.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=KODE sæt http-adgangskoden til KODE.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache tillad ikke serverlagring af data.\n" -#: src/main.c:760 +#: src/main.c:769 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -1999,7 +1973,7 @@ msgstr "" " --default-page=NAVN Ændr standardsidenavnet (normalt er dette\n" " 'index.html'.).\n" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2008,26 +1982,26 @@ msgstr "" " -E, --adjust-extension gem HTML/CSS-dokumenter med passende " "filendelser\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorér `Content-Length' toptekstfeltet.\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" @@ -2035,17 +2009,17 @@ msgstr "" " --max-redirect maksimalt tilladt antal omdirigeringer pr. " "side.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=BRUGER sæt BRUGER som proxybrugernavn.\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=KODE brug KODE som proxyadgangskode.\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2054,12 +2028,12 @@ msgstr "" " --referer=URL inkludér `Referer: URL'-toptekst i \n" " HTTP-forespørgsel\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers gem HTTP-topteksterne til en fil.\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2067,7 +2041,7 @@ msgid "" msgstr "" " -U, --user-agent=AGENT identificér som AGENT frem for Wget/VERSION.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2076,23 +2050,23 @@ msgstr "" " --no-http-keep-alive deaktivér HTTP-keep-alive (vedvarende \n" " forbindelser).\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=FIL indlæs cookies fra FIL før session.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=FIL gem cookies til FIL efter session.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2101,7 +2075,7 @@ msgstr "" " --keep-session-cookies indlæs og gem (ikke-permanente) " "sessionscookies\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2109,7 +2083,7 @@ msgid "" msgstr "" " --post-data=STRENG brug POST-metoden; send STRENG som data.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2117,12 +2091,12 @@ msgid "" msgstr "" " --post-file=FIL brug POST-metoden; send indhold af FIL.\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2130,7 +2104,7 @@ msgid "" msgstr "" " --post-data=STRENG brug POST-metoden; send STRENG som data.\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2138,7 +2112,7 @@ msgid "" msgstr "" " --post-file=FIL brug POST-metoden; send indhold af FIL.\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2149,13 +2123,13 @@ msgstr "" " --content-disposition respektér topteksten Content-Disposition ved\n" " valg af lokale filnavne (EKSPERIMENTEL).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2166,11 +2140,11 @@ msgstr "" " --auth-no-challenge send basal HTTP-autentifikationsinformation\n" " uden først at vente på serverens udfordring.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-tilvalg (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2180,45 +2154,45 @@ msgstr "" " --secure-protocol=PR vælg sikker protokol: en af auto, SSLv2,\n" " SSLv3 og TLSv1.\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative følg kun relative henvisninger.\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate bekræft ikke serverens certifikat.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientcertifikatfil.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE type af klientcertifikat: PEM eller DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL privat nøglefil.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TYPE type af privat nøgle: PEM eller DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FIL fil med samlingen af CA'er.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2226,12 +2200,12 @@ msgid "" msgstr "" " --ca-directory=KAT katalog hvor hashlisten af CA'er lagres.\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FIL fil med samlingen af CA'er.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2241,7 +2215,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2250,7 +2224,7 @@ msgstr "" " --random-file=FIL fil med tilfældige data til at seede \n" " SSL-talgeneratoren.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2259,27 +2233,27 @@ msgstr "" " --egd-file=FIL fil, der angiver navnet på EGD-soklen med\n" " tilfældige data\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP-flag:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache tillad ikke serverlagring af data.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-flag:\n" -#: src/main.c:869 +#: src/main.c:878 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2288,28 +2262,28 @@ msgstr "" " --ftp-stmlf Brug Stream_LF-format til alle binære FTP-" "filer.\n" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=BRUGER sæt ftp-brugeren til BRUGER.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=KODE sæt ftp-adgangskoden til KODE.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing fjern ikke '.listing'-filer.\n" # glob er f.eks. når man skriver *.txt, og skallen svarer med fil1.txt, fil2.txt, ... -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob slå globning af FTP-filnavne fra.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2317,12 +2291,12 @@ msgstr "" " --no-passive-ftp deaktivér den \"passive\" " "overførselstilstand.\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response udskriv svar fra server.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2332,54 +2306,54 @@ msgstr "" "ved\n" " rekursion\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "FTP-flag:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "FTP-flag:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=STRENG indsæt STRENG blandt topteksterne.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2387,28 +2361,28 @@ msgstr "" " -t, --tries=ANTAL sæt antal forsøg til ANTAL (0 for " "ubegrænset)\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider hent intet.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies brug ikke cookies.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2417,23 +2391,23 @@ msgstr "" " --ignore-case ingen forskel på store/små bogstaver ved\n" " matching af filer/kataloger\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursiv download:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive angiv rekursiv download.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2442,14 +2416,14 @@ msgstr "" " -l, --level=ANTAL maksimal rekursionsdybde (inf eller 0 for\n" " uendelig).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after slet filer lokalt efter de er hentet.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2460,19 +2434,19 @@ msgstr "" "pege\n" " på lokale filer.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2481,7 +2455,7 @@ msgstr "" " -K, --backup-converted før konvertering af fil X, så opret\n" " sikkerhedskopien X_orig.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2490,7 +2464,7 @@ msgstr "" " -K, --backup-converted før konvertering af fil X, så opret\n" " sikkerhedskopien X.orig.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2499,7 +2473,7 @@ msgstr "" " -m, --mirror forkortelse for -N -r -l inf --no-remove-" "listing.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2509,7 +2483,7 @@ msgstr "" "en\n" " HTML-side.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2518,11 +2492,11 @@ msgstr "" " --strict-comments brug strikt (SGML) håndtering af HTML-" "kommentarer.\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekursiv accept/afslag:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2531,7 +2505,7 @@ msgstr "" " -A, --accept=LISTE kommaadskilt liste af accepterede " "endelser.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2539,25 +2513,25 @@ msgid "" msgstr "" " -R, --reject=LISTE kommaadskilt liste af afslåede endelser.\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=TYPE vælg angivelsesmåde af fremgang.\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2565,14 +2539,14 @@ msgstr "" " -D, --domains=LISTE kommaadskilt liste af accepterede " "domæner.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTE kommaadskilt liste af afslåede domæner.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" @@ -2580,7 +2554,7 @@ msgstr "" " --follow-ftp følg FTP-henvisninger fra HTML-" "dokumenter.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2589,7 +2563,7 @@ msgstr "" " --follow-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" " følges.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2598,23 +2572,23 @@ msgstr "" " --ignore-tags=LISTE kommaadskilt liste af HTML-mærker, der\n" " ignoreres.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts hop til fremmede værter når rekursiv.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative følg kun relative henvisninger.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE liste af tillate kataloger.\n" -#: src/main.c:991 +#: src/main.c:1000 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2624,84 +2598,84 @@ msgstr "" " --trust-server-names brug navnet angivet ved den sidste komponent på " "redirektion url'en.\n" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTE liste af ekskluderede kataloger.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent gå ikke op til ophavskataloget.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Rapportér fejl og send forslag til .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, en ikke-interaktiv informationsagent.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Adgangskode for brugeren %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Adgangskode: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Adgangskode for brugeren %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Regionsindstilling (locale): " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Link: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2710,29 +2684,29 @@ msgstr "" "GNU Wget %s kompileret %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (miljø)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (bruger)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Ophavsret © 2009 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2747,7 +2721,7 @@ msgstr "" # kan ikke finde nogen en_US.po #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2755,67 +2729,67 @@ msgstr "" "\n" "Oprindeligt skrevet af Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Rapportér venligst fejl og send spørgsmål til .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv '%s --help' for flere flag.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ugyldigt flag -- '-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Kan ikke være udførlig og stille på samme tid.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Kan ikke tidsstemple og lade være at berøre eksisterende filer på samme " "tid.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Kan ikke angive både --inet4-only og --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2827,7 +2801,7 @@ msgstr "" "med -p eller -r. Flere detaljer kan findes i manualen.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2838,7 +2812,7 @@ msgstr "" "vil blive lagt i den enkelte fil, du angav.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2848,102 +2822,97 @@ msgstr "" "manualen.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Filen '%s' findes allerede, hentes ikke.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Kan ikke angive både --ask-password og --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mangler.\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Kan ikke angive både --ask-password og --password.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Kan ikke angive både --inet4-only og --inet6-only.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Denne version understøtter ikke IRI'er.\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k kan kun bruges sammen med -O hvis udskrivning er til en almindelig fil.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2951,42 +2920,42 @@ msgid "" msgstr "" "-k kan kun bruges sammen med -O hvis udskrivning er til en almindelig fil.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: kan ikke evaluere værtsadresse %s\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Fandt ingen URLer i %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kan ikke slette %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2996,7 +2965,7 @@ msgstr "" "FÆRDIG --%s--\n" "Hentede %d filer, %s på %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Hente-kvote på %s OVERSKREDET!\n" @@ -3153,107 +3122,107 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Fjerner %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Fortsætter i baggrunden.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Fortsætter i baggrunden, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Uddata vil blive skrevet til %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Fandt ingen brugbar sokkel-driver.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: advarsel: Symbolet %s fundet før noget maskinenavn\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ukendt symbol '%s'\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Brug: %s NETRC [VÆRTSNAVN]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: 'stat' fejlede for %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "ADVARSEL: bruger en svag tilfældig seed.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Kunne ikke seede pseudotilfældig talgenerator; prøv at bruge --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: kan ikke verificere certifikat for %s, udstedt af %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Kan ikke lokalt verificere udstederens autoritet.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Der blev fundet et selvunderskrevet certifikat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " De udstedte certifikat er endnu ikke gyldigt.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Det udstedte certifikat er udløbet.\n" # 'common name' kan f.eks. være et personnavn. Eksempel findes på # http://tools.ietf.org/html/rfc5280 -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3264,7 +3233,7 @@ msgstr "" # 'common name' kan f.eks. være et personnavn. Eksempel findes på # http://tools.ietf.org/html/rfc5280 -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3272,7 +3241,7 @@ msgstr "" " %s: certifikatets trivialnavn %s svarer ikke til det forespurgte " "værtsnavn %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3283,12 +3252,12 @@ msgstr "" " Dette kan være et tegn på at værten ikke er den, den udgiver sig for\n" " (altså at det ikke er den rigtige %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Brug '--no-check-certificate' for at forbinde til %s på usikker vis.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3297,29 +3266,29 @@ msgstr "" "\n" "%*s[ springer over %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Ugyldig punkt-stilangivelse %s; forbliver uændret.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " tid %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " om " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Kan ikke finde frekvens af REALTIME-ur: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Fjerner %s fordi den skal forkastes.\n" @@ -3333,22 +3302,22 @@ msgstr "Kan ikke msgid "Loading robots.txt; please ignore errors.\n" msgstr "Henter robots.txt; ignorer eventuelle fejlmeldinger.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fejl ved fortolkning af proxy-URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fejl i proxy URL %s: Skal være HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringer overskredet.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3356,7 +3325,7 @@ msgstr "" "Giver op.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3364,127 +3333,127 @@ msgstr "" "Prøver igen.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ingen fejl" # scheme? -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Ikke-understøttet skema %s" # scheme? -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Skema mangler" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Værtsnavnet er ugyldigt" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ugyldigt portnummer" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ugyldigt brugernavn" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Uafsluttet numerisk IPv6-adresse" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-adresser understøttes ikke" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ugyldig numerisk IPv6-adresse" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Understøttelse af HTTPS er ikke kompileret med" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ufuldstændig eller ugyldig flerbytesekvens fundet\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Kunne ikke allokere nok hukommelse; hukommelsen opbrugt.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Kunne ikke allokere %ld byte; hukommelsen opbrugt.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: tekstbuffer er for stor (%ld byte), afbryder.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsætter i baggrunden, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Kan ikke aflænke den symbolske lænke %s: %s\n" +msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Kunne ikke få certifikatnøgle fra %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Kunne ikke få certifikatnøgle fra %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: kan ikke evaluere værtsadresse %s\n" +msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Kunne ikke få certifikatnøgle fra %s\n" +msgstr "Kunne ikke indlæse certifikater fra %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Fejl ved skrivning til %s: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3562,29 +3531,23 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#~ msgid "" -#~ "Found no broken links.\n" -#~ "\n" -#~ msgstr "" -#~ "Fandt ingen ødelagte henvisninger.\n" -#~ "\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: flaget '--%s' tillader ikke et argument\n" -#~ msgid "" -#~ "Found %d broken link.\n" -#~ "\n" -#~ msgid_plural "" -#~ "Found %d broken links.\n" -#~ "\n" -#~ msgstr[0] "" -#~ "Fandt %d ødelagt henvisning.\n" -#~ "\n" -#~ msgstr[1] "" -#~ "Fandt %d ødelagte henvisninger.\n" -#~ "\n" +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: ukendt flag '--%s'\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: Ugyldig URL %s: %s\n" +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: flaget '-W %s' er flertydigt\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: flaget '-W %s' tillader ikke et argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: flaget '%s' kræver et argument\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Autorisation mislykkedes\n" #~ msgid "idn_decode failed (%d): %s\n" #~ msgstr "idn_decode mislykkedes (%d): %s\n" @@ -3596,8 +3559,8 @@ msgstr "" #~ "\n" #~ "%s modtaget.\n" -#~ msgid "Authorization failed.\n" -#~ msgstr "Autorisation mislykkedes\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Filen '%s' findes allerede, hentes ikke.\n" #~ msgid "" #~ "WARNING: Can't reopen standard output in binary mode;\n" @@ -3606,6 +3569,26 @@ msgstr "" #~ "ADVARSEL: Kan ikke genåbne standard-uddata i binær tilstand;\n" #~ " den hentede fil kan indeholde forkerte linjeafslutninger.\n" +#~ msgid "" +#~ "Found no broken links.\n" +#~ "\n" +#~ msgstr "" +#~ "Fandt ingen ødelagte henvisninger.\n" +#~ "\n" + +#~ msgid "" +#~ "Found %d broken link.\n" +#~ "\n" +#~ msgid_plural "" +#~ "Found %d broken links.\n" +#~ "\n" +#~ msgstr[0] "" +#~ "Fandt %d ødelagt henvisning.\n" +#~ "\n" +#~ msgstr[1] "" +#~ "Fandt %d ødelagte henvisninger.\n" +#~ "\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: ugyldigt flag -- %c\n" diff --git a/po/de.gmo b/po/de.gmo index 580b17b..04ea8e4 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 2a034be..673190e 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-17 22:11+0100\n" "Last-Translator: Jochen Hein \n" "Language-Team: German \n" @@ -20,7 +20,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Unbekannter Fehler" @@ -28,7 +28,7 @@ msgstr "Unbekannter Fehler" msgid "Address family for hostname not supported" msgstr "Adressfamilie wird für Hostnamen nicht unterstützt" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Temporärer Fehler bei der Namensauflösung" @@ -96,70 +96,45 @@ msgstr "Durch ein Signal unterbrochen" msgid "Parameter string not correctly encoded" msgstr "Der Parameter ist nicht korrekt kodiert" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Option »%s« ist mehrdeutig: mögliche Optionen:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Option »%s« ist mehrdeutig\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Option »--%s« erlaubt kein Argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: Option »%s« ist mehrdeutig: mögliche Optionen:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nicht erkannte Option »%c%s«\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Option »%c%s« erlaubt kein Argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Option »%s« benötigt ein Argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nicht erkannte Option »--%s«\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nicht erkannte Option »%c%s«\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ungültige Option -- »%c«\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Option verlangt ein Argument -- »%c«\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Option »-W %s« ist mehrdeutig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Option »-W %s« erlaubt kein Argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Option »-W %s« benötigt ein Argument\n" - # Möglicherweise sollten wir irgendwann „...“ verwenden #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -180,13 +155,13 @@ msgstr "%s: Option »-W %s« benötigt ein Argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "»" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "«" @@ -261,28 +236,28 @@ msgstr "Der Reguläre Ausdruck ist zu groß" msgid "Unmatched ) or \\)" msgstr "Schließende Klammer »)« oder »\\)« ohne passende öffnende Klammer" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Kein vorhergehender Regulärer Ausdruck" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "Pipe kann nicht erstellt werden" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s Unterprozess fehlgeschlagen" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle fehlgeschlagen" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -303,52 +278,52 @@ msgid "memory exhausted" msgstr "Speicher erschöpft" # XXX -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: Bind-Adresse %s kann nicht aufgelöst werden; Bind wird nicht verwendet.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Verbindungsaufbau zu %s|%s|:%d … " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Verbindungsaufbau zu %s:%d … " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Verbindungsaufbau zu [%s]:%d … " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF fehlgeschlagen: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "verbunden.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "fehlgeschlagen: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: Host-Adresse %s kann nicht aufgelöst werden\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR fehlgeschlagen: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -384,110 +359,110 @@ msgstr "Es ist nicht möglich, %s zu löschen: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Anlegen einer Sicherung von »%s« als »%s« nicht möglich: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Es ist nicht möglich, den Cookie für %s zu holen\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaxfehler bei Set-Cookie, %s an der Stelle %d.\n" # XXX -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie von %s versuchte die Domain zu ändern auf " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Cookie-Datei %s kann nicht geöffnet werden: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Fehler beim Schreiben in die Datei %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Fehler beim Schließen der Datei %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Nicht unterstützte Art der Auflistung; Versuch Unix-Auflistung zu " "verwenden.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index von /%s auf %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Zeit unbekannt " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Datei " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Verzeichnis " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Verweis " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Nicht sicher" -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s Bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Länge: %s" # XXX -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) sind noch übrig" # XXX -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s übrig" # wohl "unmaßgeblich", nicht "ohne Berechtigung" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (unmaßgeblich)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL kann nicht initialisiert werden. Es wird kein SSL verwendet." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Anmelden als %s … " @@ -498,75 +473,75 @@ msgstr "Anmelden als %s … " # ... Kontroll-Verbindung wird geschlossen # oder # ... Schließen der Kontroll-Verbindung -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "" "Fehler in der Antwort des Servers; Kontroll-Verbindung wird geschlossen.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Fehler bei der Begrüßung des Servers.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Schreiben schlug fehl; Kontroll-Verbindung wird geschlossen.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Der Server verweigert die Anmeldung.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Fehler bei der Anmeldung.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Angemeldet!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Der Server hat das Kommando »PBSZ 0« nicht akzeptiert.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Der Server hat das Kommando »PROT %c« nicht akzeptiert.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "" "Fehler beim Server; es ist nicht möglich, die Art des Systems " "festzustellen.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "fertig. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "fertig.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Unbekannte Art »%c«, Kontroll-Verbindung wird geschlossen.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "fertig. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nicht notwendig.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Logisch unmöglicher Abschnitt in »getftp()« wurde erreicht" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -577,7 +552,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -586,38 +561,38 @@ msgstr "" "Das Verzeichnis %s existiert nicht.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nicht erforderlich.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Die Datei ist bereits geholt worden.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "PASV-Ãœbertragung kann nicht begonnen werden.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "PASV-Antwort kann nicht ausgewertet werden.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "Verbindung zu »%s« auf Port »%d« konnte nicht hergestellt werden: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Verbindungsfehler (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ungültiger PORT.\n" # Wieder das mit der 1. Person :) -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -625,19 +600,19 @@ msgstr "" "\n" "REST schlug fehl; es wird wieder von vorn begonnen.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Die Datei %s existiert.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "" "Die Datei %s existiert nicht.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -646,7 +621,7 @@ msgstr "" "Die Datei %s existiert nicht.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -655,40 +630,40 @@ msgstr "" "Die Datei oder das Verzeichnis %s existiert nicht.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "»%s« ist plötzlich entstanden.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s; Kontroll-Verbindung wird geschlossen.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Daten-Verbindung: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Kontroll-Verbindung wurde geschlossen.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Daten-Ãœbertragung abgebrochen.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Die Datei %s ist schon vorhanden; kein erneuter Download.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(Versuch:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -698,7 +673,7 @@ msgstr "" "\n" # oder "gesichert"? -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -707,35 +682,35 @@ msgstr "" "%s (%s) - %s gespeichert [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "»%s« wird entfernt.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "%s wird als temporäre Auflistungsdatei benutzt.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s gelöscht.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Die Rekursionstiefe %d übersteigt die maximal erlaubte Tiefe %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Datei auf dem Server ist nicht neuer als die lokale Datei %s -- kein " "Download.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -744,7 +719,7 @@ msgstr "" "Datei auf dem Server ist neuer als die lokale Datei %s, -- Download " "erfolgt.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -753,267 +728,267 @@ msgstr "" "Größen stimmen nicht überein (lokal %s) -- erneuter Download.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ungültiger Name für einen symbolischen Verweis; übersprungen.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "Der richtige symbolische Verweis %s -> %s ist schon vorhanden.\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "" "Symbolischer Verweis %s -> %s wird angelegt.\n" "\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Symbolische Verweise werden nicht unterstützt; symbolischer Verweis %s " "übersprungen.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Verzeichnis %s übersprungen.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: unbekannter bzw. nicht unterstützter Dateityp.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Fehler beim Setzen der Rechte für »%s«.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: beschädigter Zeitstempel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Verzeichnisse werden nicht erneut geholt; da die Tiefe bereits %d ist (max. " "erlaubt %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" "Nicht zu %s hinabsteigen, da es ausgeschlossen bzw. nicht eingeschlossen " "ist.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s zurückgewiesen.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fehler beim Vergleichen von »%s« mit %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Keine Treffer bei dem Muster %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML-artiger Index wurde nach %s [%s] geschrieben.\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML-artiger Index wurde nach %s geschrieben.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" "ERROR: Verzeichnis »%s« kann nicht geöffnet werden.\n" "\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: Zertifikat »%s« kann nicht geöffnet werden: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA-Zertifikat »%s« wurde geladen\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERROR: CRL-Datei »%s« kann nicht geladen werden: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL-Datei »%s« wurde geladen\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ERROR: GnuTLS verlangt, dass der Schlüssel und das Zertifikat vom gleichen " "Typ sind.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: Option %d zu »secure-protocol« ist nicht implementiert\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Bitte dieses Problem an melden\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: Option %d zu »secure-protocol« ist nicht implementiert\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "FEHLER" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "WARNUNG" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Kein Zertifikat angegeben von %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Dem Zertifikat von %s wird nicht vertraut.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" "%s: Das Zertifikat von »%s« wurde von einem unbekannten Austeller " "herausgegeben.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Das Zertifikat von %s wurde für ungültig erklärt.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Der Unterzeichner des Zertifikats von %s ist keine CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Das Zertifikat von »%s« wurde mit einem unsicheren Algorithmus " "signiert.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Dem Zertifikat von %s ist noch nicht aktiviert.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Das Zertifikat von %s ist abgelaufen.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fehler beim Initialisieren des X509-Zertifikates: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Kein Zertifikat gefunden.\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fehler beim Auswerten des Zertifikates: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Das ausgestellte Zertifikat ist noch nicht aktiviert.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Das ausgestellte Zertifikat ist nicht mehr gültig.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Der Zertifikat-Eigentümer passt nicht zum Hostname %s.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" "Der öffentliche Schlüssel ist nicht mehr der gespeicherte öffentliche " "Schlüssel!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Es muss ein X.509-Zertifikat verwendet werden\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Fehler in der Verarbeitung der Adressliste.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Unbekannter Rechner" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Auflösen des Hostnamens %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "Fehler: Keine IPv4/IPv6-Adresse für den Host.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "fehlgeschlagen: Wartezeit abgelaufen.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Der unvollständige Verweis »%s« kann nicht aufgelöst werden.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ungültige URL »%s«: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Fehler beim Schreiben der HTTP-Anforderung: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Keine Header, vermutlich ist es HTTP/0.9." -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1022,11 +997,11 @@ msgstr "" "Die Datei %s ist schon vorhanden; kein erneuter Download.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime hat nicht funktioniert. Das ist vermutlich ein Fehler.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1034,55 +1009,55 @@ msgstr "" "Kann den Zeitstempel nicht in das http-Format umwandeln. Benutze stattdessen " "die Zeit 0 als Zeitpunkt der letzten Änderung.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-Datendatei %s fehlt: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Wiederverwendung der bestehenden Verbindung zu [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Wiederverwendung der bestehenden Verbindung zu %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fehler beim Lesen der Proxy-Antwort: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEHLER %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Statuszeile ist nicht korrekt" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxy-Tunneling fehlgeschlagen: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Unbekanntes Authentifizierungsschema.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Authentifizierung ausgewählt: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Wird in %s gespeichert.\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1091,25 +1066,25 @@ msgstr "" "Beim Herunterladen der Signatur:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Kann den Signatur-Inhalt nicht aus der temporären Datei lesen. " "Ãœberspringe...\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Kann die temporäre Datei nicht erstellen. Ãœberspringe das Herunterladen der " "Signatur.\n" # XXX Source? -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ungültiger pri Wert. Verwende %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1117,50 +1092,50 @@ msgstr "" "Kann keinen akzeptablen Digest für die Metalink Ressource finden.\n" "Diese werden ignoriert.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL wird ausgeschaltet, nachdem Fehler aufgetreten sind.\n" # Wieder das mit der 1. Person :) -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-Anforderung gesendet, auf Antwort wird gewartet … " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Keine Daten empfangen.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefehler (%s) beim Vorspann (header).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(keine Beschreibung)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Platz: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nicht spezifiziert" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [folgend]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "Datei %s auf dem Server unverändert. Wird nicht heruntergeladen.\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1171,7 +1146,7 @@ msgstr "" "Sie möchten vielleicht die Option »--no-if-modified-since« verwenden.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1182,62 +1157,62 @@ msgstr "" "\n" # Header -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Länge: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "übergangen" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warnung: Joker-Zeichen werden bei HTTP nicht unterstützt.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Spider-Modus eingeschaltet. Es wird geprüft, ob die Datei auf dem Server " "existiert.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Schreiben nach %s nicht möglich (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Ein notwendiges Attribut im empfangenen Header fehlt.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Authentifizierung mit Benutzername/Passwort fehlgeschlagen.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "In die WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "In die temporäre WARC-Datei kann nicht geschrieben werden.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Es ist nicht möglich, eine SSL-Verbindung herzustellen.\n" # XXX -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Verweis auf %s kann nicht entfernt werden (%s).\n" # Was meint hier location? -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEHLER: Umleitung (%d) ohne Ziel.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1245,24 +1220,24 @@ msgstr "" "Keine Metalink-Daten in der HTTP-Antwort. Datei wird mittel HTTP GET " "heruntergeladen.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink Header gefunden. Metalink Modus wird verwendet.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" "Die Datei auf dem Server existiert nicht -- Verweis ist nicht gültig!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "»Last-modified«-Kopfzeile fehlt -- Zeitstempel abgeschaltet.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "»Last-modified«-Kopfzeile ungültig -- Zeitstempel übergangen.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1271,16 +1246,16 @@ msgstr "" "Datei auf dem Server nicht neuer als die lokale Datei %s -- kein Download.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Größen stimmen nicht überein (lokal %s) -- erneuter Download.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Datei der Gegenseite ist neuer, erneuter Download.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1288,7 +1263,7 @@ msgid "" msgstr "" "Datei auf dem Server existiert und enhält Verweise -- Download erfolgt.\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1296,7 +1271,7 @@ msgstr "" "Datei auf dem Server existiert, aber enhält keine Verweise -- kein " "Download.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1306,7 +1281,7 @@ msgstr "" "aber Rekursion ist abgeschaltet -- kein Download.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1314,12 +1289,12 @@ msgstr "" "Datei auf dem Server existiert.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1328,7 +1303,7 @@ msgstr "" "%s (%s) - auf die Standardausgabe geschrieben %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1337,58 +1312,58 @@ msgstr "" "%s (%s) - %s gespeichert [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbindung bei Byte %s geschlossen. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefehler bei Byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefehler bei Byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualität des Schutzes »%s« wird nicht unterstützt.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nicht unterstützter Algorithmus »%s«.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC zeigt auf die Datei »%s«, die nicht existiert.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: »%s« nicht lesbar (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fehler in der Datei »%s« bei Zeile %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Fehler in der Datei »%s« in Zeile %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Unbekannter Befehl %s in der Datei »%s« in Zeile %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1399,7 +1374,7 @@ msgstr "" "Bitte »%s« prüfen,\n" "oder eine andere Datei mittels »--config« angeben.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1410,48 +1385,48 @@ msgstr "" "Bitte »%s« prüfen,\n" "oder eine andere Datei mittels »--config« angeben.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Warnung: »wgetrc« des Systems und des Benutzers zeigen beide auf %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ungültiger »--execute«-Befehl %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ungültiger Schalter %s, bitte »on« oder »off« angeben.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: %s ist ungültig, bitte »on«, »off« oder »quiet« angeben.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ungültige Nummer %s\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s darf nur einmal verwendet werden\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ungültiger Byte-Wert %s.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ungültige Zeitperiode %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1460,28 +1435,28 @@ msgstr "" "für use-askpass muss eine Zeichenkette angegeben werden oder entweder die " "Umgebungsvariable WGET_ASKPASS oder SSH_ASKPASS gesetzt sein.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ungültiger Wert %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ungültige Kopfzeile %s\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ungültige WARC Kopfzeile %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ungültiger Fortschrittstyp %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1491,40 +1466,40 @@ msgstr "" " verwenden Sie [unix|vms|windows],[lowercase|uppercase],[nocontrol]," "[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Die Kodierung %s ist nicht korrekt\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konvertierung von %s nach %s wird nicht unterstützt\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Unvollständige oder ungültige Multi-Byte-Sequenz\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Fehlernummer %d nicht behandelt\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: Lokale ist nicht gesetzt\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode fehlgeschlagen (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Fehler beim Konvertieren zu Kleinbuchstaben: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1533,19 +1508,19 @@ msgstr "" "\n" "Ausgabe wird nach %s umgeleitet.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; Protokollierung wird ausgeschaltet.\n" # usage → »Aufruf« ist einige der wenigen Regeln, die wir beim TP # überhaupt haben ;) -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Aufruf: %s [OPTION]... [URL] …\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1554,70 +1529,70 @@ msgstr "" "erforderlich.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Beim Start:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version Programmversion von Wget anzeigen und " "beenden\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help diese Hilfe anzeigen\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background nach dem Starten in den Hintergrund " "gehen\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=BEFEHL einen ».wgetrc«-artigen Befehl ausführen\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Log-Datei schreiben und Eingabe-Datei:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=DATEI Protokoll-Meldungen in DATEI schreiben\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DATEI Meldungen an DATEI anhängen\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug Debug-Ausgabe anzeigen\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32 Debug-Ausgabe anzeigen\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet keine Ausgabe von Meldungen\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose ausführliche Meldungen (Vorgabe)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose weniger Meldungen, aber nicht stumm\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1625,7 +1600,7 @@ msgstr "" " --report-speed=TYP Bandbreite als TYP ausgeben.\n" " TYP kann »bits« sein.\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1633,7 +1608,7 @@ msgstr "" " -i, --input-file=DATEI in lokaler oder externer DATEI\n" " gelistete URLs holen\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1641,11 +1616,11 @@ msgstr "" " --input-metalink=DATEI in lokaler Metalink DATEI gelistete\n" " URLs holen\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Eingabe-Datei als HTML behandeln\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1654,27 +1629,27 @@ msgstr "" "F)\n" " relativ zur URL auflösen\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=DATEI Datei mit der Konfiguration\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config keine Konfigrationsdatei verwenden\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=DATEI Grund der URL-Ablehnung in DATEI " "schreiben\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1683,20 +1658,20 @@ msgstr "" "setzen\n" " (0 steht für unbegrenzt)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused Wiederholen, auch wenn der Partner die\n" " Verbindung abgelehnt hat\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=DATEI Dokumente in DATEI schreiben\n" # Werden solche Zeilen umgebrochen, sollten die folgenden Zeilen # um zwei Zeichen eingerückt werden -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1704,7 +1679,7 @@ msgstr "" " -nc, --no-clobber Downloads überspringen, die bestehende\n" " Dateien überschreiben würden\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1712,7 +1687,7 @@ msgid "" msgstr "" " --no-config keine Konfigrationsdatei verwenden\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1721,19 +1696,19 @@ msgstr "" "zum\n" " Teil geholten Datei\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" " --start-pos=OFFSET Start Download ab OFFSET (Null-basiert)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=STYLE Fortschrittsanzeige mit STYLE darstellen\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1741,7 +1716,7 @@ msgstr "" " --show-progress Immer eine Fortschrittsanzeige " "darstellen\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1751,7 +1726,7 @@ msgstr "" "lokalen\n" " Dateien sind\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1761,7 +1736,7 @@ msgstr "" " GET-Requests im Zeitstempel-Modus\n" " nicht verwenden\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1771,21 +1746,21 @@ msgstr "" "auf\n" " dem Server.\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response Antwort des Servers anzeigen\n" # XXX -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" " --spider kein Download (nichts herunterladen)\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEKUNDEN alle Timeouts auf SEKUNDEN setzen\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1793,7 +1768,7 @@ msgstr "" " --dns-servers=ADRESSEN Liste der zu befragenden DNS-Server " "(Komma-separiert)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1802,29 +1777,29 @@ msgstr "" " oder IP) des lokalen Rechners\n" " binden\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNDEN den Timeout der DNS-Abfrage auf\n" " SEKUNDEN setzen\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEKUNDEN den Verbindungs-Timeout auf SEKUNDEN " "setzen\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEKUNDEN den Lese-Timeout auf SEKUNDEN setzen\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEKUNDEN SEKUNDEN zwischen den Downloads warten\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1833,7 +1808,7 @@ msgstr "" "Versuchen\n" " warten\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1841,17 +1816,17 @@ msgstr "" " --random-wait Zwischen 0,5*WAIT und 1,5*WAIT Sekunden\n" " zwischen den Abfragen warten\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy Keinen Proxy verwenden\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ZAHL Kontingent für den Download auf ZAHL " "setzen\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1859,19 +1834,19 @@ msgstr "" " --bind-address=ADRESSE An die ADRESSE (Hostname oder IP) des\n" " lokalen Rechners binden\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE Datenrate beim Download auf RATE " "begrenzen\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache Zwischenspeichern von DNS-Abfragen\n" " ausschalten\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1880,7 +1855,7 @@ msgstr "" " diejenigen einschränken, die das\n" " Betriebssystem erlaubt\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1888,15 +1863,15 @@ msgstr "" " --ignore-case Groß-/Kleinschreibung bei Datei- und\n" " Verzeichnisnamen ignorieren\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only Nur zu IPv4-Adressen verbinden\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only Nur zu IPv6-Adressen verbinden\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1906,24 +1881,24 @@ msgstr "" " Familie aufbauen, eins von »IPv6«,\n" " »IPv4« oder »none«\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=BENUTZER BENUTZER als ftp- und http-Benutzer\n" " verwenden\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PASSWORT PASSWORT als ftp- und http-Passwort\n" " verwenden\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password Nach Passworten fragen\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1941,30 +1916,30 @@ msgstr "" " WGET_ASKPASS oder SSH_ASKPASS " "verwendet.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri Unterstützung für IRI abschalten\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC ENC als die lokale Kodierung\n" " für IRIs verwenden\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC ENC als die externe Standardkodierung\n" " verwenden\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink Datei löschen vor dem Ãœberschreiben\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1972,7 +1947,7 @@ msgstr "" " --keep-badhash behalte Dateien mit Prüfsummenfehler (es " "wird ».badhash« angehängt)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1980,7 +1955,7 @@ msgstr "" " --metalink-index=NUMMER Metalink Applikation bzw. metalink4+xml " "metaurl Ordnungszahl NUMMER\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1988,14 +1963,14 @@ msgstr "" " --metalink-over-http verwende Metalink Metadaten aus dem\n" " HTTP Response Header\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location bevorzugter Ort für Metalink Ressourcen\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -2003,36 +1978,36 @@ msgstr "" " --no-xattr keine Metadaten in erweiterten " "Dateiattributen speichern\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Verzeichnisse:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories keine Verzeichnisse anlegen\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories Anlegen von Verzeichnissen erzwingen\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories keine Host-Verzeichnisse anlegen\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories Den Protokollnamen in Verzeichnissen\n" " verwenden\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=PRÄFIX Dateien unter dem Verzeichnis PRÄFIX/..\n" " speichern\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2041,26 +2016,26 @@ msgstr "" "Gegenseite\n" " überspringen\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-Optionen:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=BENUTZER http-Benutzer auf BENUTZER setzen\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=PASSWORT http-Passwort auf PASSWORT setzen\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache Serverseitige Zwischenspeicherung der " "Daten\n" " verbieten\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2068,7 +2043,7 @@ msgstr "" " --default-page=NAME Den Namen der Standard-Seite ändern\n" " (normalerweise »index.html«)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2077,18 +2052,18 @@ msgstr "" "richtigen\n" " Namenserweiterung speichern\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length das »Content-Length«-Kopffeld ignorieren\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=ZEICHENKETTE ZEICHENKETTE in die Kopfzeilen einfügen\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2096,24 +2071,24 @@ msgid "" msgstr "" " --progress=STYLE Fortschrittsanzeige mit STYLE darstellen\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximale Anzahl erlaubter »Redirects«\n" " (Umleitungen) pro Seite\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=BENUTZER BENUTZER als Proxy-Benutzername " "verwenden\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=PASS PASS als Proxy-Passwort verwenden\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2121,14 +2096,14 @@ msgstr "" " --referer=URL die Kopfzeile »Referer: URL« der HTTP-\n" " Anforderung hinzufügen\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers den HTTP-Vorspann (header lines) in " "einer\n" " Datei sichern\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2136,7 +2111,7 @@ msgstr "" " -U, --user-agent=AGENT als AGENT anstelle von Wget/VERSION\n" " identifizieren\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2145,24 +2120,24 @@ msgstr "" "Verbindungen)\n" " deaktivieren\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies Cookies nicht verwenden\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=DATEI Cookies vor der Sitzung aus der DATEI " "laden\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=DATEI Cookies nach der Sitzung in der DATEI\n" " speichern\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2170,7 +2145,7 @@ msgstr "" " --keep-session-cookies (nicht-permanente) Session-Cookies\n" " laden und speichern\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2178,7 +2153,7 @@ msgstr "" " --post-data=ZEICHENKETTE Die POST-Methode verwenden, dabei die\n" " ZEICHENKETTE als Daten senden\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2187,14 +2162,14 @@ msgstr "" "Inhalt\n" " aus DATEI verwenden\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod die Methode »HTTPMethod« im Header " "verwenden\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2202,7 +2177,7 @@ msgstr "" " --body-data=ZEICHENKETTE ZEICHENKETTE als Daten verwenden.\n" " »--method« muss angegeben werden\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2210,7 +2185,7 @@ msgstr "" " --body-file=DATEI Den Inhalt der Datei als Daten senden.\n" " »--method« muss angegeben werden.\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2221,7 +2196,7 @@ msgstr "" " Auswahl lokaler Dateinamen beachten\n" " (EXPERIMENTELL).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2229,7 +2204,7 @@ msgstr "" " --content-on-error Den empfangenen Inhalt ausgeben, wenn\n" " der Server einen Fehler meldet.\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2242,11 +2217,11 @@ msgstr "" "Aufforderung des\n" " Serverszu warten\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) Optionen:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2257,54 +2232,54 @@ msgstr "" " »SSLv2«, »SSLv3«, »TLSv1« oder »PFS«\n" " verwenden.\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only Nur sicheren HTTPS-Verweisen folgen\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate Das Server-Zertifikat nicht prüfen\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DATEI Datei mit dem Client-Zertifikat\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYP Typ des Client-Zertifikates, entweder\n" " »PEM« oder »DER«\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DATEI Datei mit dem geheimen Schlüssel\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYP Typ des geheimen Schlüssels, entweder\n" " »PEM« oder »DER«\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DATEI Datei mit der CA-Sammlung\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=VERZEICHNIS Verzeichnis mit der Hash-Liste der CAs\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DATEI Datei mit der CRL-Sammlung\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2322,7 +2297,7 @@ msgstr "" " um den Kommunikationspartner zu\n" " verifizieren\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2332,7 +2307,7 @@ msgstr "" " des SSL Pseudo-Zufallszahlen-" "Generators\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2340,15 +2315,15 @@ msgstr "" " --egd-file=DATEI Dateiname des EGD-Sockets mit " "Zufallszahlen\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS-Optionen:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS nicht verwenden\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2356,11 +2331,11 @@ msgstr "" " --hsts-file Pfad der HSTS Datenbank\n" " (überschreibt den Standardwert)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-Optionen:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2368,40 +2343,40 @@ msgstr "" " --ftp-stmlf Stream_LF Format für alle binären\n" " FTP-Dateien verwenden\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=BENUTZER BENUTZER als ftp-Benutzername verwenden\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PASSWORT PASSWORT als ftp-Passwort verwenden\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing ».listing«-Dateien nicht entfernen\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob FTP-Dateinamens-Globbing ausschalten\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp Nur »aktiven« Ãœbertragungsmodus " "verwenden\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions Die Rechte der fernen Datei erhalten\n" # Check --retr-symlinks -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2410,11 +2385,11 @@ msgstr "" "(keine\n" " Verzeichnisse)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS-Optionen:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2422,7 +2397,7 @@ msgstr "" " --ftps-implicit Verwende implizit FTPS\n" " (Standardport ist 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2432,7 +2407,7 @@ msgstr "" "TLS-Sitzung der\n" " Steuer-Verbindung fortsetzen\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2440,7 +2415,7 @@ msgstr "" " --ftps-clear-data-connection nur den Steuerkanal verschlüsseln; " "alle Daten bleiben im Klartext\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2448,11 +2423,11 @@ msgstr "" " --ftps-fallback-to-ftp verwende FTP falls FTPS vom " "Zielserver nicht unterstützt wird\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC-Optionen:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2460,25 +2435,25 @@ msgstr "" " --warc-file=DATEINAME Die Anfrage- und Antwortdaten in einer\n" " .warc.gz-Datei speichern\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=ZEICHENKETTE ZEICHENKETTE in den warcinfo-Satz " "einfügen\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ZAHL Die Maximalgröße der WARC-Dateien auf\n" " ZAHL setzen\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX-Index-Dateien schreiben\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2487,17 +2462,17 @@ msgstr "" "dieser\n" " CDX-Datei enthalten sind\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression WARC-Dateien nicht mit GZIP komprimieren\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests keine SHA1-Prüfsummen berechnen\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2506,7 +2481,7 @@ msgstr "" "Datensatz\n" " speichern\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2516,15 +2491,15 @@ msgstr "" "durch\n" " den WARC-Schreiber erzeugt werden\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursiver Download:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekursiver Download\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2532,7 +2507,7 @@ msgstr "" " -l, --level=Zahl maximale Rekursionstiefe (»inf« oder »0«\n" " steht für ohne Begrenzung)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2540,7 +2515,7 @@ msgstr "" " --delete-after geholte Dateien nach dem Download " "löschen\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2549,7 +2524,7 @@ msgstr "" " -k, --convert-links Verweise in HTML- oder CSS-Downloads\n" " in lokale Verknüpfungen umwandeln\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2557,7 +2532,7 @@ msgstr "" " --convert-file-only Konvertiere nur den Dateiname der URL " "(auch als »Basename« bekannt)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2565,7 +2540,7 @@ msgstr "" " --backup=N vor dem Speichern der Datei X, bis zu N\n" " Sicherungsdateien behalten.\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2573,7 +2548,7 @@ msgstr "" " -K, --backup-converted vor dem Umwandeln der Datei X, eine\n" " Sicherung als X_orig anlagen.\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2581,7 +2556,7 @@ msgstr "" " -K, --backup-converted vor dem Umwandeln der Datei X, eine\n" " Sicherung als X.orig anlegen.\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2590,7 +2565,7 @@ msgstr "" " »-N -r -l inf --no-remove-listing«\n" " entspricht.\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2599,7 +2574,7 @@ msgstr "" "Anzeige\n" " der HTML-Seite notwendig sind\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2607,11 +2582,11 @@ msgstr "" " --strict-comments Strikte Handhabung (SGML) von\n" " HTML-Kommentaren\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekursiv erlauben/zurückweisen:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2619,7 +2594,7 @@ msgstr "" " -A, --accept=LISTE komma-unterteilte Liste der erlaubten\n" " Dateiendungen\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2627,53 +2602,53 @@ msgstr "" " -R, --reject=LISTE komma-unterteilte Liste der\n" " zurückzuweisenden Erweiterungen\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX regulärer Ausdruck, zu dem die " "akzeptierten\n" " URLs passen\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX regulärer Ausdruck, zu dem die " "abgewiesenen\n" " URLs passen\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYPE Typ des regulären Ausdrucks (posix|" "pcre).\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE Typ des regulären Ausdrucks (posix).\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTE komma-unterteilte Liste der erlaubten\n" " Domains\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTE komma-unterteilte Liste der\n" " zurückzuweisenden Domains\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp FTP-Verweisen von HTML-Dokumenten aus\n" " folgen\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2681,7 +2656,7 @@ msgstr "" " --follow-tags=LISTE komma-unterteilte Liste der zu folgenden\n" " HTML-Tags\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2689,23 +2664,23 @@ msgstr "" " --ignore-tags=LISTE komma-unterteilte Liste der zu\n" " missachtenden HTML-Tags\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts wenn »--recursive«, auch zu fremden " "Hosts\n" " gehen\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative nur relativen Verweisen folgen\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LISTE Liste der erlaubten Verzeichnisse\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2716,20 +2691,20 @@ msgstr "" "Namen\n" " verwenden.\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LISTE Liste der auszuschließenden " "Verzeichnisse\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent nicht in das übergeordnete Verzeichnis\n" " wechseln\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -2738,70 +2713,70 @@ msgstr "" "Für die deutsche Ãœbersetzung ist die Mailingliste\n" " zuständig.\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, ein nicht-interaktives Netz-Werkzeug zum Download von Dateien.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Passwort für Benutzer %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Passwort: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Pipe kann nicht erstellt werden\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Fehler bei der Intialisierung der Aktion für use-askpass: %d\n" # XXX -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Fehler bei Datei-Aktionen für use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Fehler beim Lesen der Antwort zum Kommando »%s %s«: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Benutzername für »%s%s«: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Passwort für Benutzer »%s%s@%s«: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Ãœbersetzt: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Gebunden: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2810,29 +2785,29 @@ msgstr "" "GNU Wget %s übersetzt unter %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (Umgebung)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (Benutzer)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (System)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2846,7 +2821,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2854,7 +2829,7 @@ msgstr "" "\n" "Ursprünglich geschrieben von Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Fehlerberichte und Verbesserungsvorschläge bitte an \n" @@ -2862,33 +2837,33 @@ msgstr "" "\n" "Für die deutsche Ãœbersetzung ist die Mailingliste zuständig.\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problem bei der Speicheranforderung\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Aufgrund eines Fehlers in %s wird beendet\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ungültige Option -- »-n%c«\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Debugging-Unterstützung ist nicht einkompiliert, »--debug« wird ignoriert.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2897,7 +2872,7 @@ msgstr "" "Sowohl »--no-clobber« als auch »--convert-links« angegeben, nur\n" "»--convert-links« wird verwendet.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2906,25 +2881,25 @@ msgstr "" "Sowohl »--no-clobber« als auch »--convert-file-only« angegeben, nur\n" "»--convert-file-only« wird verwendet.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "»Ausführliche« und »keine Meldungen« ist gleichzeitig unmöglich.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "»Zeitstempel« und Ȇberschreibung alter Dateien« ist gleichzeitig " "unmöglich.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "Die Optionen »--inet4-only« und »--inet6-only« sind gemeinsam nicht erlaubt\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2936,7 +2911,7 @@ msgstr "" "angegeben sind. Weitere Informationen finden Sie im Handbuch.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2946,7 +2921,7 @@ msgstr "" "bedeutet, dass jeglicher Download in genau der angegebenen Datei\n" "gespeichert wird.\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2956,12 +2931,7 @@ msgstr "" "»-O«. Genauere Erläuterungen finden Sie im Handbuch.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Die Datei »%s« ist schon vorhanden; kein erneuter Download.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2969,7 +2939,7 @@ msgstr "" "WARC-Ausgabe funktioniert nicht mit »--no-clobber«, »--no-clobber« wird " "deaktiviert.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2977,12 +2947,12 @@ msgstr "" "WARC-Ausgabe funktioniert nicht mit Zeitstempeln, Zeitstempel werden " "deaktiviert.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-Ausgabe funktioniert nicht mit »--spider«.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2991,7 +2961,7 @@ msgstr "" "WARC-Ausgabe funktioniert nicht mit »--continue« oder »--start-pos«,\n" "die Option wird deaktiviert.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2999,7 +2969,7 @@ msgstr "" "WARC-Digests sind deaktiviert; WARC-Deduplication wird keine doppelten\n" "Datensätze finden.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3008,14 +2978,14 @@ msgstr "" "WARC-Ausgabe funktioniert nicht mit »--continue« oder »--start-pos«,\n" "die Option wird deaktiviert.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Die Optionen »--ask-password« und »--password« sind gemeinsam nicht " "erlaubt.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3024,19 +2994,19 @@ msgstr "" "Sowohl »--start-pos« als auch »--continue« anzugeben ist nicht empfohlen;\n" "»--continue« wird nicht verwendet.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL fehlt\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Die Optionen »--ask-password« und »--password« sind gemeinsam nicht " "erlaubt.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3046,7 +3016,7 @@ msgstr "" "»--method« verwendet werden. Bei der Option »--method« werden die Daten\n" "mit den Optionen »--body-data« oder »--body-file« angegeben.\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3055,18 +3025,18 @@ msgstr "" "Für »--body-data« oder »--body-file« muss eine Methode mittels\n" "»--method=HTTPMethod« angegeben werden.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" "Die Optionen »--body-data« und »--body-file« sind gemeinsam nicht erlaubt.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Diese Version unterstützt keine IRIs.\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3075,7 +3045,7 @@ msgstr "" "eine\n" "normale Datei ist.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3084,43 +3054,43 @@ msgstr "" "»--covert-links« oder »--convert-files-only« kann nur zusammen\n" "verwendet werden, wenn die Ausgabe eine normale Datei ist.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Fehler beim Initialisieren der Bibliothek »libares«\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Initialisieren der »c-ares« Kommunikation\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Fehler beim Parsen der IP-Adresse »%s«\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Fehler beim Setzen der/s DNS-Server(s) »%s« (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Keine URLs in %s gefunden.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kann die Metalink Datei %s nicht parsen.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Konnte nicht alle Ressourcen von %s herunterladen.\n" # XXX -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3131,7 +3101,7 @@ msgstr "" "Verstrichene Zeit: %s\n" "Geholt: %d Dateien, %s in %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download-Kontingent von %s ERSCHÖPFT!\n" @@ -3291,117 +3261,117 @@ msgstr "Datei %s wurde abgerufen, aber die Signatur passt nicht.\n" msgid "Renaming %s to %s.\n" msgstr "Benenne %s in %s um.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Im Hintergrund geht es weiter.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Im Hintergrund geht es weiter, die Prozessnummer ist %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Ausgabe wird nach %s geschrieben.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() fehlgeschlagen\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() fehlgeschlagen\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Kein benutzbarer Socket-Treiber auffindbar.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "ioctl() fehlgeschlagen.\n" "Der Socket kann nicht auf Blockieren eingestellt werden.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: Warnung: %s-Wortteil erscheint vor jeglichem Maschinennamen\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: unbekannter Wortteil »%s«\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Aufruf: %s NETRC [HOSTNAME]\n" # stat -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: Aufruf von »stat« für %s nicht möglich: %s\n" # XXX -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" "WARNUNG: Der Zufallszahlengenerator wird mit einem schwachen Wert " "initialisiert.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Der Zufallszahlengenerator konnte nicht initialisiert werden,\n" "denken Sie über --random-file nach.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Ihre OpenSSL-Version ist zu alt, um TLSv1.1 zu unterstützen\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Ihre OpenSSL-Version ist zu alt, um TLSv1.2 zu unterstützen\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: Option %d zu »secure-protocol« ist nicht implementiert\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" "%s: Das Zertifikat von %s kann nicht geprüft werden, ausgestellt von %s:.\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" " Die Autorität des Ausstellers des Zertifikates kann lokal nicht geprüft " "werden.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Ein selbst-signiertes Zertifikat wurde gefunden.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Das ausgestellte Zertifikat ist noch nicht gültig.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Das ausgestellte Zertifikat ist nicht mehr gültig.\n" # XXX -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3410,7 +3380,7 @@ msgstr "" "%s: Keiner der alternativen Namen des Zertifikats stimmt mit dem angefragten " "Maschinennamen %s überein.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3418,7 +3388,7 @@ msgstr "" " %s: Der Common Name %s des Zertifikates entspricht nicht dem " "angeforderten Hostnamen %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3431,14 +3401,14 @@ msgstr "" " nicht derjenige ist, der er zu sein vorgibt\n" " (also nicht der echte %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Verwenden Sie »--no-check-certificate«, um zu dem Server %s eine nicht " "gesicherte Verbindung aufzubauen.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3447,7 +3417,7 @@ msgstr "" "\n" "%*s[ %sK wird übersprungen ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3455,21 +3425,21 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " ETA %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " in " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Der Takt der Echtzeit-Uhr kann nicht bestimmt werden: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "»%s« wird entfernt, da dies zurückgewiesen werden soll.\n" @@ -3483,22 +3453,22 @@ msgstr "»%s« kann nicht geöffnet werden: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "»robots.txt« wird geladen; bitte Fehler ignorieren.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fehler beim Auswerten der Proxy-URL »%s«: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fehler in der Proxy-URL »%s«: Es muss eine HTTP-URL sein.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d: Die Anzahl der Verweise ist zu groß.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3506,7 +3476,7 @@ msgstr "" "Aufgegeben.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3514,126 +3484,126 @@ msgstr "" "Erneuter Versuch.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Kein Fehler" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nicht unterstütztes Schema %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schema fehlt" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Ungültiger Hostname" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ungültige Port-Nummer" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ungültiger Benutzername" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Unvollständige numerische IPv6-Adresse" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-Adressen werden nicht unterstützt" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ungültige numerische IPv6-Adresse" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Keine HTTPS-Unterstützung einkompiliert" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Unvollständige oder ungültige Multi-Byte-Sequenz\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Fehler beim Zuweisen von ausreichend Speicher; Speicher erschöpft.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Fehler beim Zuweisen von %ld Bytes; Speicher erschöpft.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: Textpuffer ist zu groß (%d Bytes), Abbruch.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Im Hintergrund geht es weiter, die Prozessnummer ist %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Entfernen des symbolischen Verweises %s fehlgeschlagen: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Fehler beim Initialisieren der Bibliothek »libares«\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Fehler beim Setzen der Rechte für »%s«.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Fehler beim Setzen der Rechte für »%s«.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Fehler beim Parsen der IP-Adresse »%s«\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Fehler beim Setzen der Rechte für »%s«.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ungültiger Regulärer Ausdruck %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fehler beim Matchen %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3718,6 +3688,24 @@ msgstr "" "Exakter Treffer in der CDX-Datei gefunden.\n" "Revisit-Datensatz wird in WARC gespeichert.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: Option »--%s« erlaubt kein Argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: nicht erkannte Option »--%s«\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: Option »-W %s« ist mehrdeutig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Option »-W %s« erlaubt kein Argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: Option »-W %s« benötigt ein Argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Die Datei »%s« ist schon vorhanden; kein erneuter Download.\n" + # Besser als: Alle Verweise ok? #~ msgid "" #~ "Found no broken links.\n" diff --git a/po/el.gmo b/po/el.gmo index 10aafeb..0fd640b 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 3feb7f2..53387a4 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2004-12-15 19:46+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Άγνωστο σφάλμα" @@ -25,7 +25,7 @@ msgstr "Άγνωστο σφάλμα" msgid "Address family for hostname not supported" msgstr "" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -94,70 +94,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Άγνωστο σφάλμα" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: η επιλογή `%s' είναι αόÏιστη\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: η επιλογή `%s' είναι αόÏιστη\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: η επιλογή `--%s' δεν επιδέχεται ÏŒÏισμα\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: μη αναγνωÏίσιμη επιλογή `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: η επιλογή `%c%s' δεν επιδέχεται ÏŒÏισμα\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: η επιλογή `%s' απαιτεί ÏŒÏισμα\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: μη αναγνωÏίσημη επιλογή `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: μη αναγνωÏίσιμη επιλογή `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: μη αποδεκτή επιλογή -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: η επιλογή απαιτεί μια παÏάμετÏο -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: η επιλογή `%s' είναι αόÏιστη\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: η επιλογή `--%s' δεν επιδέχεται ÏŒÏισμα\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: η επιλογή `%s' απαιτεί ÏŒÏισμα\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -177,13 +152,13 @@ msgstr "%s: η επιλογή `%s' απαιτεί ÏŒÏισμα\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -258,28 +233,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -298,51 +273,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, fuzzy, c-format msgid "Connecting to %s|%s|:%d... " msgstr "ΣÏνδεση με %s[%s]:%hu... " -#: src/connect.c:291 +#: src/connect.c:289 #, fuzzy, c-format msgid "Connecting to %s:%d... " msgstr "ΣÏνδεση με %s:%hu... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "ΣÏνδεση με %s[%s]:%hu... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "συνδέθηκε.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "απέτυχε: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -376,176 +351,176 @@ msgstr "Αποτυχία διαγÏαφής του `%s': %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "ΑδÏνατη η λήψη αντιγÏάγου ασφαλείας του %s ως %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Αποτυχία διαγÏαφής του `%s': %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, fuzzy, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Συντακτικό σφάλμα στο Set-Cookie: Ï€ÏόωÏο τέλος αλφαÏιθμητικοÏ.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "ΑδÏνατο το άνοιγμα του αÏχείου cookies `%s': %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Σφάλμα στην εγγÏαφή στο `%s': %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Σφάλμα στο κλείσιμο του `%s': %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Μη υποστηÏιζόμενος Ï„Ïπος καταλόγου, δοκιμάζω να τον διαβάσω σαν Unix " "κατάλογο.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Κατάλογος του /%s στο %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "ÏŽÏα άγνωστη " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "ΑÏχείο " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Κατάλογος " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "ΣÏνδεση " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Όχι απόλυτα σίγουÏος " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Μήκος: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (ανεπίσημο)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Αυθεντικοποίηση ως %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Σφάλμα στην απάντηση του διακομιστή, κλείνει η σÏνδεση ελέγχου.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Σφάλμα στο μήνυμα αποδοχής του διακομιστή.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Αποτυχία στην εγγÏαφή δεδομένων, κλείνει η σÏνδεση ελέγχου.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Ο διακομιστής απαγοÏεÏει τη σÏνδεση.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Σφάλμα στην αυθεντικοποίηση.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Επιτυχής σÏνδεση!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Σφάλμα διακομιστή, δεν μποÏÏŽ να συμπεÏάνω τον Ï„Ïπο του συστήματος.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "έγινε. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "έγινε.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Άγνωστος Ï„Ïπος `%c', διακοπή της σÏνδεσης.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "έγινε. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD δεν απαιτήται.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -553,45 +528,45 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" "\n" msgstr "Δεν υπάÏχει τέτοιος κατάλογος `%s'.\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD δεν απαιτείται.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Δεν είναι δυνατή να ξεκινήσει μεταφοÏά Ï„Ïπου PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Δεν είναι δυνατή η μετάφÏαση της απάντησης PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, fuzzy, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "αδÏνατη η σÏνδεση στο %s:%hu: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Σφάλμα στη σÏνδεση (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Μη έγκυÏη ΘΥΡΑ.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -599,19 +574,19 @@ msgstr "" "\n" "Αποτυχία στην εντολή REST, εκκίνηση από την αÏχή.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "Δεν υπάÏχει αÏχείο `%s'.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -620,7 +595,7 @@ msgstr "" "Δεν υπάÏχει αÏχείο `%s'.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -629,47 +604,47 @@ msgstr "" "Δεν υπάÏχει αÏχείο ή κατάλογος `%s'.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, κλείσιμο σÏνδεσης ελέγχου.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - ΣÏνδεση δεδομένων: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Η σÏνδεση ελέγχου έκλεισε.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Η μεταφοÏά δεδομένων διακόπηκε ανώμαλα.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(Ï€Ïοσπάθεια:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -678,28 +653,28 @@ msgstr "" "%s (%s) - `%s' αποθηκεÏτηκε [%ld]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "ΔιαγÏαφή του %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "ΧÏήση του `%s' για Ï€ÏοσωÏινό αÏχείο πεÏιεχομένων καταλόγου.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "ΔιαγÏαφή του `%s'.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Το επίπεδο αναδÏομής %d ξεπέÏασε το μέγιστο επίπεδο αναδÏομής %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" @@ -707,7 +682,7 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -717,18 +692,18 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "Τα μεγέθη δεν είναι ίσα (τοπικό %ld) -- γίνεται ανάκτηση.\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Μη έγκυÏο όνομα ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï ÏƒÏ…Î½Î´Î­ÏƒÎ¼Î¿Ï…, παÏακάμπτεται.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -737,376 +712,376 @@ msgstr "" "ΥπάÏχει ήδη ο οÏθός σÏνδεσμος %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "ΔημιουÏγία συνδέσμου %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Δεν υποστηÏίζονται σÏνδεσμοι, παÏάκαμψη συνδέσμου `%s'.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "ΠαÏάκαμψη καταλόγου `%s'.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: άγνωστο/μη υποστηÏιζόμενο είδος αÏχείου.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: εσφαλμένη ημεÏομηνία αÏχείου.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Δεν θα ανακτηθοÏν κατάλογοι διότι το βάθος είναι %d (μέγιστο %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" "Δεν επεκτεινόμαστε στο `%s' διότι είναι εξαιÏοÏμενο/μη-συμπεÏιλαμβανόμενο\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "ΑπόÏÏιψη του `%s'.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Σφάλμα στην εγγÏαφή στο `%s': %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "Δεν βÏέθηκαν ταιÏιάσματα στη μοÏφή `%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ΓÏάφτηκε αÏχείο καταλόγου σε HTML στο `%s' [%ld].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ΓÏάφτηκε αÏχείο καταλόγου σε HTML στο `%s'.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 #, fuzzy msgid "Unknown host" msgstr "Άγνωστο σφάλμα" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "ΕÏÏεση του %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 #, fuzzy msgid "failed: timed out.\n" msgstr "απέτυχε: %s.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: ΑδÏνατη η ανάλυση μη ολοκληÏωμένου συνδέσμου %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, fuzzy, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Σφάλμα στην εγγÏαφή της αίτησης HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "ΧÏήση ξανά της σÏνδεσης στο %s:%hu.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "ΧÏήση ξανά της σÏνδεσης στο %s:%hu.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Σφάλμα στην εγγÏαφή της αίτησης HTTP: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Εσφαλμένη γÏαμμή κατάστασης" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Άγνωστο σχήμα αυθεντικοποίησης.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Άγνωστο σχήμα αυθεντικοποίησης.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Η αίτηση για %s στάλθηκε, αναμονή απάντησης... " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "Δεν ελήφθησαν δεδομένα" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Σφάλμα ανάγνωσης (%s) στις κεφαλίδες.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(χωÏίς πεÏιγÏαφή)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Τοποθεσία: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "μη οÏισμένο" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [ακολουθεί]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1114,7 +1089,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1123,84 +1098,84 @@ msgstr "" "\n" " Το αÏχείο έχει ήδη ανακτηθεί πλήÏως· τίποτα να κάνω.\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Μήκος: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "αγνοείται" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" "ΠÏοειδοποίηση: μεταχαÏακτήÏες (wildcards) δεν υποστηÏίζονται στο HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "ΑδÏνατη η σÏσταση σÏνδεσης SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Αδυναμία στην εγγÏαφή στο `%s' (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ΣΦΑΛΜΑ: Μετάσταση (%d) χωÏίς τοποθεσία.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Κεφαλίδα Last-modified δεν υπάÏχει -- χÏονικές αναφοÏές απενεÏγοποιήθηκαν.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Κεφαλίδα Last-modified δεν είναι έγκυÏη -- χÏονικές αναφοÏές αγνοοÏνται.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1210,16 +1185,16 @@ msgstr "" "γίνεται ανάκτηση.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Τα μεγέθη δεν είναι ίσα (τοπικό %ld) -- γίνεται ανάκτηση ξανά.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "ΑπομακÏυσμένο αÏχείο είναι νεότεÏο, έναÏξη ανάκτησης.\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1230,7 +1205,7 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1240,33 +1215,33 @@ msgstr "" "ανάκτηση.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "ΑπομακÏυσμένο αÏχείο είναι νεότεÏο, έναÏξη ανάκτησης.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ΣΦΑΛΜΑ %d: %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1275,58 +1250,58 @@ msgstr "" "%s (%s) - `%s' αποθηκεÏτηκε [%ld/%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Η σÏνδεση διακόπηκε στο byte %ld. " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Σφάλμα ανάγνωσης στο byte %ld/%ld (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:582 +#: src/init.c:581 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Αδυναμία ανάγνωσης %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Σφάλμα στο %s στη γÏαμμή %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Σφάλμα στο %s στη γÏαμμή %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: ΣΦΑΛΜΑ: Άγνωστη εντολή `%s', τιμή `%s'.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1334,7 +1309,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1342,117 +1317,117 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: ΠÏοειδοποίηση: Το wgetrc του συστήματος και του χÏήστη δείχνουν στο ίδιο " "αÏχείο `%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ΠαÏακαλώ οÏίστε on ή off.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: ΠαÏακαλώ οÏίστε on ή off.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Μη έγκυÏος Ï„Ïπος Ï€Ïοόδου `%s'.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Μη έγκυÏος Ï„Ïπος Ï€Ïοόδου `%s'.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "%s: %s: Μη έγκυÏη ÏÏθμιση `%s'.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "αδÏνατη η σÏνδεση στο %s:%hu: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1461,17 +1436,17 @@ msgstr "" "\n" "%s λήφθηκε, ανακατεÏθυνση εξόδου στο `%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; απενεÏγοποίηση λήψης καταγÏαφών.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ΧÏήση: %s [ΕΠΙΛΟΓΗ]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1482,291 +1457,291 @@ msgstr "" "τα σÏντομα οÏίσματα.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1777,212 +1752,212 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 #, fuzzy msgid "Directories:\n" msgstr "Κατάλογος " -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1990,13 +1965,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2004,58 +1979,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2065,408 +2040,408 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, ένα μη-διαλογικό δικτυακό Ï€ÏόγÏαμμα ανάκτησης αÏχείων.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "" "Πνευματικά Δικαιώματα (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software " "Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2476,7 +2451,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 #, fuzzy msgid "" "\n" @@ -2485,69 +2460,69 @@ msgstr "" "\n" "ΓÏάφτηκε αÏχικά από τον Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Στείλτε αναφοÏές σφαλμάτων και Ï€Ïοτάσεις στο .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Δοκιμάστε `%s --help' για πεÏισσότεÏες επιλογές Ïυθμίσεων.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: μη αποδεκτή επιλογή -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "%s: η υποστήÏιξη εκσφαλμάτωσης δεν έχει συμπεÏιληφθεί στη μεταγλώττιση.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Δεν μποÏÏŽ να είμαι επεξηγηματικός και ταυτόχÏονα σιωπηλός.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Δεν μποÏÏŽ να χÏησιμοποιώ χÏονικές αναφοÏές και ταυτόχÏονα να μην υποκαθιστώ " "τα αÏχεία βάση των αναφοÏών.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2555,157 +2530,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Το αÏχείο `%s' υπάÏχει ήδη, δεν επανακτάται.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: παÏαλείφθηκε το URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Δεν βÏέθηκαν URL στο %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Αποτυχία διαγÏαφής του `%s': %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2716,7 +2686,7 @@ msgstr "" "ΤΕΡΜΑΤΙΣΜΟΣ --%s--\n" "ΜεταφοÏτώθηκαν: %s byte σε %d αÏχεία\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "" @@ -2874,122 +2844,122 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "ΔιαγÏαφή του %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Εκτέλεση στο παÏασκήνιο.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr "" "Συνέχιση στο παÏασκήνιο, ταυτότητα διεÏγασίας (pid) %d.\n" "\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Η έξοδος θα γÏαφτεί στο `%s'.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Αδυναμία εÏÏεσης έγκυÏου Î¿Î´Î·Î³Î¿Ï Î´Î¹ÎºÏ„Ïου.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: Ï€Ïοειδοποίηση: το τμήμα \"%s\" εμφανίζεται Ï€Ïιν από τα ονόματα " "των μηχανημάτων\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: άγνωστος τελεσταίος \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ΧÏήση: %s NETRC [ΟÎΟΜΑ ΜΗΧΑÎΗΜΑΤΟΣ]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: αδυναμία Ï€Ïόσβασης στο %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "ΑδÏνατη η αÏχικοποίηση της PRNG της OpenSSL· απενεÏγοποίηση του SSL.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2997,12 +2967,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -3011,28 +2981,28 @@ msgstr "" "\n" "%*s[ παÏάκαμψη %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Μη έγκυÏη ÏÏθμιση στυλ τελείας `%s'· παÏαμένει χωÏίς αλλαγή.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "ΔιαγÏαφή του %s Î±Ï†Î¿Ï Î¸Î± έπÏεπε να αποÏÏιφθεί.\n" @@ -3047,22 +3017,22 @@ msgid "Loading robots.txt; please ignore errors.\n" msgstr "" "Ανάγνωση του robots.txt; παÏακαλώ αγνοείστε τυχόν μηνÏματα σφαλμάτων.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Σφάλμα στην ανάλυση του URL του διαμεσολαβητή %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Σφάλμα στο URL διαμεσολαβητή %s: ΠÏέπει να είναι HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "ΥπέÏβαση %d επανακατευθÏνσεων.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3070,7 +3040,7 @@ msgstr "" "Εγκαταλείπω.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3078,131 +3048,131 @@ msgstr "" "ΠÏοσπάθεια ξανά.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 #, fuzzy msgid "No error" msgstr "Άγνωστο σφάλμα" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 #, fuzzy msgid "Invalid host name" msgstr "Μη έγκυÏο όνομα εξυπηÏετητή" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "" -#: src/url.c:686 +#: src/url.c:684 #, fuzzy msgid "Invalid user name" msgstr "Μη έγκυÏο όνομα εξυπηÏετητή" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr "" "%s: η υποστήÏιξη εκσφαλμάτωσης δεν έχει συμπεÏιληφθεί στη μεταγλώττιση.\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "" "Συνέχιση στο παÏασκήνιο, ταυτότητα διεÏγασίας (pid) %d.\n" "\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Αποτυχία διαγÏαφής ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï ÏƒÏ…Î½Î´Î­ÏƒÎ¼Î¿Ï… `%s': %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Αποτυχία λήψης ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î±Ï€ÏŒ %s\n" +msgstr "Αποτυχία φόÏτωσης πιστοποιητικών από %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Σφάλμα στην εγγÏαφή στο `%s': %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3280,12 +3250,6 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "Δεν ελήφθησαν δεδομένα" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Σφάλμα στο Set-Cookie, πεδίο `%s'" @@ -3299,9 +3263,23 @@ msgstr "" #~ msgid " [%s to go]" #~ msgstr " [%s για πέÏας]" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: η επιλογή `--%s' δεν επιδέχεται ÏŒÏισμα\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: μη αναγνωÏίσημη επιλογή `--%s'\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: μη αποδεκτή επιλογή -- %c\n" +#, fuzzy +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: η επιλογή `%s' είναι αόÏιστη\n" + +#, fuzzy +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: η επιλογή `--%s' δεν επιδέχεται ÏŒÏισμα\n" + #~ msgid "Host not found" #~ msgstr "Ο διακομιστής δε βÏέθηκε" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index d0f1e6c..7278237 100644 Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ diff --git a/po/en_GB.po b/po/en_GB.po index fb76223..025238d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2004-05-27 21:46-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Unknown error" @@ -26,7 +26,7 @@ msgstr "Unknown error" msgid "Address family for hostname not supported" msgstr "IPv6 addresses not supported" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -96,70 +96,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Unknown error" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: option `%s' is ambiguous\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: option `%s' is ambiguous\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: option `--%s' doesn't allow an argument\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: unrecognised option `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: option `%c%s' doesn't allow an argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: option `%s' requires an argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: unrecognised option `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: unrecognised option `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: option `-W %s' is ambiguous\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: option `-W %s' doesn't allow an argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: option `%s' requires an argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -179,13 +154,13 @@ msgstr "%s: option `%s' requires an argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -260,28 +235,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -300,51 +275,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, fuzzy, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Connecting to %s[%s]:%hu... " -#: src/connect.c:291 +#: src/connect.c:289 #, fuzzy, c-format msgid "Connecting to %s:%d... " msgstr "Connecting to %s:%hu... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "Connecting to %s[%s]:%hu... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "connected.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "failed: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -378,174 +353,174 @@ msgstr "Unable to delete `%s': %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Cannot back up %s as %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Unable to delete `%s': %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntax error in Set-Cookie: %s at position %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Cannot open cookies file `%s': %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Error writing to `%s': %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Error closing `%s': %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Unsupported listing type, trying Unix listing parser.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index of /%s on %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "time unknown " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "File " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Directory " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Not sure " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Length: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (unauthoritative)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Logging in as %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Error in server response, closing control connection.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Error in server greeting.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Write failed, closing control connection.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "The server refuses login.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Login incorrect.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Logged in!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Server error, can't determine system type.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "done. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "done.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Unknown type `%c', closing control connection.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "done. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD not needed.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -553,7 +528,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -562,38 +537,38 @@ msgstr "" "No such directory `%s'.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD not required.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Cannot initiate PASV transfer.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Cannot parse PASV response.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, fuzzy, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "couldn't connect to %s:%hu: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind error (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Invalid PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -601,19 +576,19 @@ msgstr "" "\n" "REST failed, starting from scratch.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "No such file `%s'.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -622,7 +597,7 @@ msgstr "" "No such file `%s'.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -631,47 +606,47 @@ msgstr "" "No such file or directory `%s'.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, closing control connection.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Data connection: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Control connection closed.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Data transfer aborted.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(try:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -680,33 +655,33 @@ msgstr "" "%s (%s) - `%s' saved [%ld]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Removing %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "Using `%s' as listing tmp file.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "Removed `%s'.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Recursion depth %d exceeded max. depth %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Remote file no newer than local file `%s' -- not retrieving.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -715,7 +690,7 @@ msgstr "" "Remote file is newer than local file `%s' -- retrieving.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -724,11 +699,11 @@ msgstr "" "The sizes do not match (local %ld) -- retrieving.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Invalid name of the symlink, skipping.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -737,374 +712,374 @@ msgstr "" "Already have correct symlink %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creating symlink %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Symlinks not supported, skipping symlink `%s'.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "Skipping directory `%s'.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: unknown/unsupported file type.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Failed to get certificate key from %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: corrupt time-stamp.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Will not retrieve dirs since depth is %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Not descending to `%s' as it is excluded/not-included.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Rejecting `%s'.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Error writing to `%s': %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "No matches on pattern `%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Wrote HTML-ised index to `%s' [%ld].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Wrote HTML-ised index to `%s'.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Failed to load certificates from %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Mail bug reports and suggestions to .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 #, fuzzy msgid "Unknown host" msgstr "Unknown error" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Resolving %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "failed: timed out.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Cannot resolve incomplete link %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, fuzzy, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: %s: Invalid value `%s'.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Failed writing HTTP request: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "File `%s' already there, not retrieving.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reusing connection to %s:%hu.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reusing connection to %s:%hu.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Failed writing HTTP request: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Malformed status line" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Unknown authentication scheme.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Unknown authentication scheme.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s request sent, awaiting response... " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "No data received" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Read error (%s) in headers.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(no description)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Location: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "unspecified" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [following]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1112,7 +1087,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1122,81 +1097,81 @@ msgstr "" " The file is already fully retrieved; nothing to do.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Length: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignored" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Warning: wildcards not supported in HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Unable to establish SSL connection.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Cannot write to `%s' (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirection (%d) without location.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified header missing -- time-stamps turned off.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified header invalid -- time-stamp ignored.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1205,16 +1180,16 @@ msgstr "" "Server file no newer than local file `%s' -- not retrieving.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "The sizes do not match (local %ld) -- retrieving.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1224,40 +1199,40 @@ msgstr "" "Remote file is newer than local file `%s' -- retrieving.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Remote file no newer than local file `%s' -- not retrieving.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Remote file is newer, retrieving.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1266,58 +1241,58 @@ msgstr "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connection closed at byte %ld. " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Read error at byte %ld (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Read error at byte %ld/%ld (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Unsupported scheme" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC points to %s, which doesn't exist.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Cannot read %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Error in %s at line %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Error in %s at line %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Error in %s at line %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1325,7 +1300,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1333,115 +1308,115 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Warning: Both system and user wgetrc point to `%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Invalid --execute command `%s'\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Invalid boolean `%s', use `on' or `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Invalid boolean `%s', use `on' or `off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Invalid number `%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Invalid byte value `%s'\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Invalid time period `%s'\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Invalid value `%s'.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Invalid header `%s'.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Invalid header `%s'.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Invalid progress type `%s'.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "%s: %s: Invalid restriction `%s', use `unix' or `windows'.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "couldn't connect to %s:%hu: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1450,17 +1425,17 @@ msgstr "" "\n" "%s received, redirecting output to `%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; disabling logging.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Usage: %s [OPTION]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1470,291 +1445,291 @@ msgstr "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1765,212 +1740,212 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 #, fuzzy msgid "Directories:\n" msgstr "Directory " -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1978,13 +1953,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1992,58 +1967,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2053,406 +2028,406 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Mail bug reports and suggestions to .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, a non-interactive network retriever.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2462,7 +2437,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2470,66 +2445,66 @@ msgstr "" "\n" "Originally written by Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Mail bug reports and suggestions to .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Try `%s --help' for more options.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegal option -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: debug support not compiled in.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Can't be verbose and quiet at the same time.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Can't timestamp and not clobber old files at the same time.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2537,157 +2512,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "File `%s' already there, not retrieving.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: missing URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "No URLs found in %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Unable to delete `%s': %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Failed to load certificates from %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2698,7 +2668,7 @@ msgstr "" "FINISHED --%s--\n" "Downloaded: %s bytes in %d files\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download quota (%s bytes) EXCEEDED!\n" @@ -2854,118 +2824,118 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Removing %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Continuing in background.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Continuing in background, pid %d.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Output will be written to `%s'.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Couldn't find usable socket driver.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: unknown token \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Usage: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: cannot stat %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Could not seed OpenSSL PRNG; disabling SSL.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2973,12 +2943,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -2987,28 +2957,28 @@ msgstr "" "\n" "%*s[ skipping %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Invalid dot style specification `%s'; leaving unchanged.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Removing %s since it should be rejected.\n" @@ -3022,22 +2992,22 @@ msgstr "Cannot convert links in %s: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Loading robots.txt; please ignore errors.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error parsing proxy URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Error in proxy URL %s: Must be HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections exceeded.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3045,7 +3015,7 @@ msgstr "" "Giving up.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3053,126 +3023,126 @@ msgstr "" "Retrying.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "No error" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "Unsupported scheme" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 #, fuzzy msgid "Invalid host name" msgstr "Invalid user name" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Bad port number" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Invalid user name" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Unterminated IPv6 numeric address" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 addresses not supported" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Invalid IPv6 numeric address" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr "%s: debug support not compiled in.\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuing in background, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Failed to unlink symlink `%s': %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Failed to get certificate key from %s\n" +msgstr "Failed to load certificates from %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Failed to get certificate key from %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Failed to get certificate key from %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Failed to get certificate key from %s\n" +msgstr "Failed to load certificates from %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Failed to get certificate key from %s\n" +msgstr "Failed to load certificates from %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Error writing to `%s': %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3249,12 +3219,6 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "No data received" - #~ msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" #~ msgstr "Unable to convert `%s' to a bind address. Reverting to ANY.\n" @@ -3271,9 +3235,21 @@ msgstr "" #~ msgid " [%s to go]" #~ msgstr " [%s to go]" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: option `--%s' doesn't allow an argument\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: unrecognised option `--%s'\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: illegal option -- %c\n" +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: option `-W %s' is ambiguous\n" + +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: option `-W %s' doesn't allow an argument\n" + #~ msgid "Host not found" #~ msgstr "Host not found" diff --git a/po/eo.gmo b/po/eo.gmo index 9a33e56..746a53e 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 4c1b33b..dba9267 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.18\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2016-11-13 21:42-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nekonata sistem-eraro" @@ -28,7 +28,7 @@ msgstr "Nekonata sistem-eraro" msgid "Address family for hostname not supported" msgstr "Adres-familio por gastig-nomo ne estas subtenata" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Dumtempa malsukceso dum nom-eltrovo" @@ -96,70 +96,45 @@ msgstr "Interrompita de signalo" msgid "Parameter string not correctly encoded" msgstr "Parametra ĉeno ne estas Äuste enkodigita" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Nekonata eraro" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: modifilo '%s' estas plursenca; ebloj:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: modifilo '%s' estas plursenca\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: modifilo '--%s' ne permesas argumenton\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: modifilo '%s' estas plursenca; ebloj:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nerekonata modifilo '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: modifilo '%c%s' ne permesas argumenton\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: modifilo '--%s' postulas argumenton\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nerekonata modifilo '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nerekonata modifilo '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: malvalida modifilo -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: modifilo postulas argumenton -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: modifilo '-W %s' estas plursenca\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: modifilo '-W %s' ne permesas argumenton\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: modifilo 'W %s' postulas argumenton\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -179,13 +154,13 @@ msgstr "%s: modifilo 'W %s' postulas argumenton\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "'" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -258,28 +233,28 @@ msgstr "Regulesprimo tro grandas" msgid "Unmatched ) or \\)" msgstr "Senpara ) aÅ­ \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Mankas antaÅ­a regulesprimo" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "ne eblas krei dukton" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "subprocezo %s malsukcesis" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle malsukcesis" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "ne eblas restarigi fd %d: dup2 malsukcesis" @@ -298,51 +273,51 @@ msgstr "Subprocezo %s ricevis fatalan signalon %d" msgid "memory exhausted" msgstr "memoro estas plenigita" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: ne eblas solvi bind-adreson %s; ni malebligas bindon.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Konektado al %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Konektado al %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Konektado al [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "konektita.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "malsukceso: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ne eblas trovi gastigantan adreson %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -376,174 +351,174 @@ msgstr "Ne eblas forviÅi %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ne eblas kopii %s kiel %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Ne eblas preni kuketon por %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Sintaksa eraro en Set-Cookie: %s ĉe pozicio %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Kuketo venanta el %s provis difini retadreson al " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ne eblas malfermi kuketan dosieron %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Eraro dum skribo al %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Eraro dum fermo de %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Ne subtenata listiga tipo, ni provas Uniksan listigan analizilon.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indekso de /%s en %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "horaro nekonata " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Dosiero " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Dosierujo " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Ligilo " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Sen certeco " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtoj)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Grando: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restanta" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s restanta" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (sen permeso)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Ne eblis lanĉi SSL. Äœi estos malaktiva." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Salutanta kiel %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Eraro en la servila respondo, ni fermas la stirkonekton.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Eraro en la saluto de servilo.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Skrib-fiasko, ni fermas la stirkonekton.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "La servilo rifuzis la ensaluton.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "MalÄusta ensaluto.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Ensalutita!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "La servilo ne akceptis la komandon 'PBSZ 0'.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "La servilo ne akceptis la komandon 'PROT %c'.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Eraro de la servilo, ne eblas difini la sistem-tipon.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "farita. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "farita.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo '%c' nekonatas, ni fermas la stirkonekton.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "farita. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD ne necesas.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Logike malebla sekcio estis atingita de getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -554,7 +529,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -563,37 +538,37 @@ msgstr "" "Netrovita dosierujo %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ne estas postulata.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "La dosiero jam estas havigita.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ne eblas komenci transporton PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "ne eblas analizi respondon PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "ne eblis konekti al %s pordo %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind-eraro (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Malvalida pordo.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -601,17 +576,17 @@ msgstr "" "\n" "REST fiaskis, ni rekomencas de la bazo.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "La dosiero %s ekzistas.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Neniu tia dosiero %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -620,7 +595,7 @@ msgstr "" "Neniu tia dosiero %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -629,40 +604,40 @@ msgstr "" "Neniu tia dosiero aÅ­ dosierujo %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ekfloris naskiÄe.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, ni fermas stirkonekton.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Konekto de datumaro: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Stirkonekto estas fermita.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Transporto de datumoj estas ĉesigita.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "La dosiero %s jam estas ĉi tie; Äi ne estos elÅutita.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(provo:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -671,7 +646,7 @@ msgstr "" "%s (%s) - skribita al ĉefeligo %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -680,33 +655,33 @@ msgstr "" "%s (%s) - %s konservita [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Ni forviÅas %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Ni uzas %s kiel provizoran listig-dosieron.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Ni forigis %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Nivelo de rekursio %d superas maksimuman nivelon %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Fora dosiero ne estas pli nova ol loka %s -- ni ne elÅutas.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -715,7 +690,7 @@ msgstr "" "Fora dosiero estas pli nova ol loka %s -- ni elÅutas.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -724,11 +699,11 @@ msgstr "" "La grandoj ne egalas (loka %s) -- ni elÅutas.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Malvalida nomo de simbola ligilo, ni pretersaltas.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -737,240 +712,240 @@ msgstr "" "Simbola ligilo jam estis Äusta %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Ni kreas simbolan ligilon %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Simbolaj ligiloj ne estas subtenataj, ni pretersaltas %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ni pretersaltas dosierujon %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: nekonata/nesubtenata dosier-tipo.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Ne eblas preni kuketon por %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: fuÅita tempindiko.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Dosierujoj ne estos elÅutitaj dum nivelo de rekursio estas %d (maksimuma " "%d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ni ne iras suben al %s ĉar Äi estas forigita/ne-inkluzivita.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Ni rifuzas %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Eraro dum kongruo de %s kontraŭ %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Neniu kongruo ĉe la Åablono %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ni skribis HTML-igitan indekson al %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ni skribis HTML-igitan indekson al %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERARO: ne eblas malfermi la dosierujon %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERARO: ni fiaskis malfermi atestilon %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ni Åargis la CA-atestilon '%s'\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERARO: fiasko dum Åargo de la CRL-dosieroatestilon '%s': (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Ni Åargis la CRL-dosieron '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ERARO: GnuTLS postulas ke la Ålosilo kaj la atestilo estu samtipaj.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: nerealigita 'sekurec-protokola' modifil-valoro %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Bonvolu raporti tiun ĉi problemon al bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: nerealigita 'sekurec-protokola' modifil-valoro %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERARO" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVERTO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: neniu atestilo estis prezentata de %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: la atestilo de %s de estas fidinda.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: la atestilo de %s ne sukcesis havi konatan eldonanton.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: la atestilo de %s estas senvalidigita.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: la atestila signanto de %s ne estis CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: la atestilo de %s estis signata uzante nesekuran algoritmon.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: la atestilo de %s ankoraÅ­ ne estas aktiva.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: la atestilo de %s senvalidiÄis.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Eraro dum ekigo de atestilo X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Neniu atestilo estis trovata\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Eraro dum analizo de atestilo: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "La atestilo ankoraÅ­ ne estas aktivigita\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "La atestilo eksvalidiÄis\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "La atestila posedanto ne kongruas al la gastigant-nomo %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "La publika Ålosilo ne kongruas al PIN-igita publika Ålosilo!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Atestilo devas esti X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Eraro dum traktado de adres-listo.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Nekonata retnodo" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Ni solvigas %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "fiasko: ne estas IPv4/IPv6 adreso por la retnodo.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "fiasko: limtempo finiÄis.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: ne eblis solvigi nekompletan ligilon %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: malvalida URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Fiasko dum skribo de HTTP-peton: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Sen ĉapoj, ni supozas HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -979,11 +954,11 @@ msgstr "" "La dosiero %s jam estas tie; Äi ne estos elÅutata.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime malsukcesis. Probable tio estas programeraro.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -991,55 +966,55 @@ msgstr "" "Ne eblas konverti tempindikon al formo http. Ni retropaÅas al tempo 0 kiel " "lasta modif-tempo.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-datumar-dosiero %s mankas: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ni reuzas ekzistantan konekton al [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ni reuzas ekzistantan konekton al %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fiasko dum lego de prokurila respondo: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERARO %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "FuÅa stat-linio" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Prokura tuneligo fiaskis: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Nekonata aÅ­tentikiga Åablono.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Elektita aÅ­tentikiÄo: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Ni konservas al: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1048,20 +1023,20 @@ msgstr "" "Dum elÅuto de subskribo:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Ne eblas legi subskriba enhavo el provizora dosiero. Ni saltas.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ne eblis krei provizoran dosieron. Ni saltas elÅuton de subskribo.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Malvalida valoro pri. Ni konsideras %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1069,42 +1044,42 @@ msgstr "" "Ne eblis trovi akceptebla resumo por rimedoj Metalink.\n" "Ni preteratentas ilin.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Ni malebligas SSL pro aperintaj eraroj.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s peto sendita, ni atendas respondon... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Neniu datumaro estas ricevita.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Leg-eraro (%s) en kapoj.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sen priskribo)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Loko: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nespecifita" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [sekvanta]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1113,7 +1088,7 @@ msgstr "" "La dosiero %s ne estas modifita en servilo. Ni preterpasas la elÅuton.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1124,7 +1099,7 @@ msgstr "" "Vi eble volas aldoni la modifilon --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1134,58 +1109,58 @@ msgstr "" " La dosiero estas fakte tute elÅutita; nenio farendas.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Grando: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "preteratentita" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Averto: ĵokeroj ne estas subtenataj en HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Arenea reÄimo ebligita. Kontrolu ĉu fora dosiero ekzistas.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ne eblas skribi al %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Mankas postulata atributo el Kaplinio 'received'.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "AÅ­tentikigo de uzantnomo/pasvorto fiaskis.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ne eblas skribi al dosiero WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ne eblas skribi al provizora dosiero WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ne eblas starigi SSL-konekton.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ne eblas forigi %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERARO: redirektigo (%d) sen loko.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1193,24 +1168,24 @@ msgstr "" "Ne eblis trovi datumaron Metalink en respondo HTTP. Ni elÅutas la dosieron " "uzante HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Kapoj Metalink estis trovataj. Ni Åaltas la reÄimon Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fora dosiero ne ekzistas -- fuÅa ligo!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Mankas ĉapo 'last-modified' -- temp-indikoj estas malaktivitaj.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Malvalida ĉapo 'last-modified' -- temp-indikoj estas preteratentitaj.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1219,16 +1194,16 @@ msgstr "" "Servila dosiero ne estas pli nova ol loka %s -- ni ne elÅutas.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "La grandoj ne interkongruas (loka %s) -- ni elÅutas.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Fora dosiero estas pli nova, ni elÅutas.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1238,7 +1213,7 @@ msgstr "" "elÅutas.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1246,7 +1221,7 @@ msgstr "" "Fora dosiero ekzistas sed enhavas neniun ligon -- ni ne elÅutas.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1256,7 +1231,7 @@ msgstr "" "sed rikuro estas malaktivita -- ni ne elÅutas.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1264,12 +1239,12 @@ msgstr "" "Fora dosiero ekzistas.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1278,7 +1253,7 @@ msgstr "" "%s (%s) - skribita al ĉefeligujo %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1287,58 +1262,58 @@ msgstr "" "%s (%s) - %s konservita [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konekto fermita ĉe la bajto %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leg-eraro ĉe la bajto %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Leg-eraro ĉe la bajto %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nesubtenata eco de protekto '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nesubtenata algoritmo '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC indikas %s, kiu ne ekzistas.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ne eblas legi %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Eraro en %s ĉe linio %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Sintaksa eraro en %s ĉe linio %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: nekonata komando %s en %s ĉe linio %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1349,7 +1324,7 @@ msgstr "" "kontrolu '%s',\n" "aÅ­ indiku malsaman dosieron uzante --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1360,76 +1335,76 @@ msgstr "" "kontrolu '%s',\n" "aÅ­ indiku malsaman dosieron uzante --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Averto: la wgetrc, kaj de la sistemo kaj de la uzanto, indikas %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: malvalida komando --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: malvalida buleo %s; uzu 'on' aÅ­ 'off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: malvalida %s; uzu 'on', 'off' aÅ­ 'quiet'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: malvalida numero %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s devas esti uzata nur unufoje\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: malvalida bajt-valoro %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: malvalida tempo-periodo %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: malvalida valoro %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: malvalida ĉapo %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: malvalida ĉapo WARC %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: malvalida progres-tipo %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1438,40 +1413,40 @@ msgstr "" "%s: %s: malvalida limigo %s,\n" " uzu [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Enkodigo %s ne validas\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konverto de %s al %s ne estas subtenata\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Malkompleta aÅ­ malvalida plurbajta sekvo estis trovata\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Netraktita errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: lokaĵaro ne estas difinita\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode fiaskis (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "ne eblis konekti al %s pordo %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1480,17 +1455,17 @@ msgstr "" "\n" "%s estis ricevata, ni redirektas eligon al %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; ni malebligas protokoladon.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uzmaniero: %s [MODIFILO]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1498,67 +1473,67 @@ msgstr "" "Nepraj argumentoj por longaj modifiloj ankaÅ­ nepras por la mallongaj.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Ekigo:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version montri la version de Wget kaj eliri\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help montri tiun ĉi helpilon\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background iri al fona reÄimo post ekigo\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMANDO lanĉi komandon laŭ stilo '.wgetrc'\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Saluta kaj enig-dosiero:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=DOSIERO log mesaÄoj al DOSIERO\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DOSIERO postmeti mesaÄojn al DOSIERO\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug montri multe da rafiniga informaro\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug montri rafinigan eligon Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet kviete (neniu eligo)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose fariÄi detalema (tio ĉi aprioras)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose malÅalti detalemon, sen esti kvieta\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1566,7 +1541,7 @@ msgstr "" " --report-speed=TIPO eligi bendlarÄo kiel TIPO. TIPO povas " "esti 'bits'\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1574,7 +1549,7 @@ msgstr "" " -i, --input-file=DOSIERO elÅuti URL-ojn trovitajn en loka aÅ­ " "ekstera DOSIERO\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1582,11 +1557,11 @@ msgstr "" " --input-metalink=DORSIERO elÅuti dosierojn traktatajn en loka meta-" "liga DOSIERO.\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html trakti enig-dosieron kiel HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1595,26 +1570,26 @@ msgstr "" "-F)\n" " relativajn al URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=DOSIERO indiki uzotan agord-dosieron\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=DOSIERO protokoli kialojn de malakcepto al " "DOSIERO\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "ElÅuti:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1622,18 +1597,18 @@ msgstr "" " -t, --tries=NOMBRO agordi nombron de reprovoj je NOMBRO (0 " "senlimigas)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused provi reen eĉ se la konekto estas " "rifuzita\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=DOSIERO skribi dokumentojn al DOSIERO\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1641,21 +1616,21 @@ msgstr "" " -nc, --no-clobber preterpasi elÅutojn kiuj anstataÅ­igus\n" " ekzistantajn dosierojn\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue daÅ­rigi uzi dosieron parte elÅutita\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1663,11 +1638,11 @@ msgstr "" " --start-pos=DEÅœOVO komenci elÅuton el nul-bazita pozicio " "DEÅœOVO\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TIPO elekti progres-montrilan tipon\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1675,7 +1650,7 @@ msgstr "" " --show-progress montri la progres-breton en iu ajn " "detaliga reÄimo\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1685,7 +1660,7 @@ msgstr "" "ol\n" " la loka\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1695,7 +1670,7 @@ msgstr "" "preni\n" " petojn laÅ­ reÄimo de tempindiko\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1704,20 +1679,20 @@ msgstr "" "per\n" " tiu de la servilo\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response montri respondon de la servilo\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ne elÅuti ion ajn\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDOJ agordi ĉiujn temp-limojn je SEKUNDOJ\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1725,7 +1700,7 @@ msgstr "" " --dns-servers=ADRESOJ listo da DNS-serviloj por alpeti " "(apartitaj de komoj)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1733,27 +1708,27 @@ msgstr "" " --bind-dns-address=ADRESO ligi DNS-solvilon al ADRESO (gastigant-" "nomo aÅ­ IP) en la loka gastiganto\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEK agordi la temp-limon por serĉo de DNS je " "SEK\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEK agordi la temp-limon por konekto je SEK\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEK agordi la temp-limon por lego je SEK\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDOJ atendi SEKUNDOJn inter elÅutoj\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1761,7 +1736,7 @@ msgstr "" " --waitretry=SEKUNDOJ atendi 1..SEKUNDOJn inter reprovoj de " "elÅutoj\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1769,15 +1744,15 @@ msgstr "" " --random-wait atendi de 0.5*WAIT...1.5*WAIT sekundoj " "inter elÅutoj\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy nepre malÅalti prokur-servilon\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMERO difini elÅuta limo al NUMERO\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1785,15 +1760,15 @@ msgstr "" " --bind-address=ADRESO ligi al ADRESO (gastigant-nomo aÅ­ IP) en " "la loka gastiganto\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RAPIDO limigi elÅut-rapido al RAPIDO\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache malebligi kaÅmemorajn DNS-serĉojn\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1801,7 +1776,7 @@ msgstr "" " --restrict-file-names=OS limigi signojn en dosiernomoj al tiuj " "permesataj de la OS\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1809,15 +1784,15 @@ msgstr "" " --ignore-case preteratenti usklecon dum kongruo al " "dosieroj/dosierujoj\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only konekti nur al adresoj IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only konekti nur al adresoj IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1827,24 +1802,24 @@ msgstr "" "familio,\n" " unu el IPv6, IPv4, aÅ­ neniu\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=UZANTO difini uzanton kaj de FTP kaj HTTP kiel " "UZANTO\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PASV difini pasvorton kaj de FTP kaj de HTTP " "kiel PASV\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password peti pasvortojn\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1855,41 +1830,41 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri malÅalti subteno al IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENK uzi ENK kiel lokan enkodigon por IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENK uzi ENK kiel la aprioran deforan " "enkodigon\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink forigi la dosieron antaÅ­ ol pereigo\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1897,14 +1872,14 @@ msgstr "" " --metalink-over-http uzi metadatumaron Metalink el kapoj de " "respondo HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location preferata loko por rimedoj Metalink\n" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " @@ -1913,32 +1888,32 @@ msgstr "" " --no-glob malebligi Åablonojn por dosiernomoj de " "FTP\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Dosierujoj:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne krei dosierujojn\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories devigi kreon de dosierujoj\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ne krei gastigantajn dosierujojn\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories uzi protokolan nomon en dosierujoj\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIKSO konservi dosierojn al PREFIKSO/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1946,25 +1921,25 @@ msgstr "" " --cut-dirs=NOMBRO preteratenti NOMBROn da dosierujaj " "komponantoj\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Modifiloj de HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UZANTO difini http-uzanton kiel UZANTOn\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --password=PASV difini pasvorton de http kiel PASV\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache malebligi servil-enmemorigitan datumaron\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1972,7 +1947,7 @@ msgstr "" " --default-page=NOMO ÅanÄi la aprioran paÄnomon (ordinare\n" " Äi estas 'index.html'.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1980,42 +1955,42 @@ msgstr "" " -E, --adjust-extension konservi dokumentojn HTML/CSS kun taÅ­gaj " "sufiksoj\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length preteratenti la kap-kampon 'Content-" "Length'\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ĈENO enmeti ĈENO inter la kaplinioj\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TIPO elekti progres-montrilan tipon\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximumo da redirektigoj permesataj por " "paÄo\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UZANTO difini UZANTO kiel prokuran uzantnomon\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASV difini PASV kiel prokuran pasvorton\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2023,12 +1998,12 @@ msgstr "" " --referer=URL inkluzivigi la kapon 'Referer: URL' en " "peto HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers konservi la kapliniojn HTTP en dosieron\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2036,7 +2011,7 @@ msgstr "" " -U, --user-agent=AGENTO identigi kiel AGENTOn anstataÅ­ Wget/" "VERSIO\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2044,24 +2019,24 @@ msgstr "" " --no-http-keep-alive malebligi HTTP-an 'keep-alive' (persistaj " "konektoj)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne uzi kuketojn\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=DOSIERO Åargi kuketojn el DOSIERO antaÅ­ la " "seanco\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=DOSIERO konservi kuketojn al DOSIERO post la " "seanco\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2069,7 +2044,7 @@ msgstr "" " --keep-session-cookies Åargi kaj konservi seancajn (ne-ĉiamajn) " "kuketojn\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2077,7 +2052,7 @@ msgstr "" " --post-data=ĈENO uzi metodon POST; sendi ĈENOn kiel la " "datumaron\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2085,13 +2060,13 @@ msgstr "" " --post-file=DOSIERO uzi metodon POST; sendi enhavojn de " "DOSIERO\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetodo uzi metodon \"HTTPMetodo\" en la peto\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2099,7 +2074,7 @@ msgstr "" " --body-data=ĈENO sendi ĈENOn kiel datumaron. --method " "DEVAS esti difinita\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2107,7 +2082,7 @@ msgstr "" " --body-file=DOSIERO sendi enhavojn de DOSIERO. --method DEVAS " "esti difinita\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2119,7 +2094,7 @@ msgstr "" " elekto de lokaj dosiernomoj " "(EKSPERIMENTA)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2127,7 +2102,7 @@ msgstr "" " --content-on-error montri la ricevitan enhavon je servilaj " "eraroj\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2138,11 +2113,11 @@ msgstr "" " sen unue atendi por testo de la " "servilo\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Modifiloj HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2153,38 +2128,38 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 aÅ­ PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only nur sekvi sekurajn ligojn HTTPS\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ne validigi la atestilon de la servilo\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DOSIERO klienta atestila dosiero\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate-type=TIPO klienta atestilo-tipo, PEM aÅ­ DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DOSIERO privata Ålosila dosiero\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TIPO privata Ålosilo-tipo, PEM aÅ­ DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DOSIERO dosiero sen aro da CA-oj\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2192,11 +2167,11 @@ msgstr "" " --ca-directory=UJO dosierujo kie haketa listo da CA-oj estas " "konservataj\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DOSIERO dosiero kun aro da CRL-oj\n" -#: src/main.c:840 +#: src/main.c:849 #, fuzzy msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" @@ -2215,7 +2190,7 @@ msgstr "" " apartitaj de ';', por kontroli " "samtavolanon\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2223,7 +2198,7 @@ msgstr "" " --random-file=DOSIERO dosiero kun hazarda datumaro por semigi " "la SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2231,15 +2206,15 @@ msgstr "" " --egd-file=DOSIERO dosiero nomigantan la ingo EGD kun " "hazarda datumaro\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Modifiloj de HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts malebligi HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2247,11 +2222,11 @@ msgstr "" " --hsts-file vojo de datumbazo HSTS (anstataÅ­igos la " "originalon)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Modifiloj FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2259,37 +2234,37 @@ msgstr "" " --ftp-stmlf uzi la formon Stream_LF por ĉiuj " "ciferecaj dosieroj FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=UZANTO difini uzanton de FTP kiel UZANTOn\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASV difini pasvorton de FTP kiel PASV\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne forigi dosierojn '.listing'\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob malebligi Åablonojn por dosiernomoj de " "FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp malebligi \"pasivan\" Åutan reÄimon\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions konservi deforajn dosier-permesojn\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2297,11 +2272,11 @@ msgstr "" " --retr-symlinks dum rikuro, preni dosierojn 'linked-" "to' (ne ujo)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Modifiloj FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2309,7 +2284,7 @@ msgstr "" " --ftps-implicit uzi implican FTPS (apriora pordo " "estas 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2319,7 +2294,7 @@ msgstr "" "en la kontrola konekto kiam\n" " oni malfermas datumaran konekton\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2327,7 +2302,7 @@ msgstr "" " --ftps-clear-data-connection ĉifri nur la kontrolan kanalon; la " "tuta datumaro estos laŭ simpla teksto\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2335,11 +2310,11 @@ msgstr "" " --ftps-fallback-to-ftp retropaÅi al FTP se FTPS ne estas " "subtenata en la celita servilo\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Modifiloj WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2347,24 +2322,24 @@ msgstr "" " --warc-file=DOSIERNOMO konservi petan/respondan datumaron al " "dosiero .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=ĈENO enmeti ĈENOn en rikordon de warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMERO difini maksimuman kvanton da dosieroj " "WARC kiel NUMEROn\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skribi indeks-dosierojn CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2372,17 +2347,17 @@ msgstr "" " --warc-dedup=DOSIERNOMO ne konservi rikordojn listigitajn en tiu " "ĉi dosiero CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ne densigi dosierojn WARC per GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ne kalkuli totalojn SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2390,7 +2365,7 @@ msgstr "" " --no-warc-keep-log ne konservi protokol-dosiero en rikordo " "WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2399,15 +2374,15 @@ msgstr "" " --warc-tempdir=DOSIERUJO loko por provizoraj dosieroj kreitaj de\n" " la skribanto WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rikura elÅuto:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive indiki rikuran elÅuton\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2415,14 +2390,14 @@ msgstr "" " -l, --level=NUMERO maksimuma rikura profundo (inf aÅ­ 0 por " "senlima)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" " --delete-after forigi dosierojn loke post elÅuti ilin\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2432,7 +2407,7 @@ msgstr "" "aÅ­ CSS indiku\n" " lokajn dosierojn\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2440,7 +2415,7 @@ msgstr "" " --convert-file-only nur konverti la dosieran parton de la URL-" "oj (baznomo)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2448,7 +2423,7 @@ msgstr "" " --backups=N antaÅ­ ol skribi dosieron X, rotacii Äis N " "savkopiajn dosierojn\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2456,7 +2431,7 @@ msgstr "" " -K, --backup-converted antaÅ­ ol konverti dosieron X, savkopii " "kiel X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2464,7 +2439,7 @@ msgstr "" " -K, --backup-converted antaÅ­ ol konverti dosieron X, savkopii " "kiel X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2472,7 +2447,7 @@ msgstr "" " -m, --mirror mallongigo por -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2480,7 +2455,7 @@ msgstr "" " -p, --page-requisites preni ĉiujn bildojn, ktp, bezonataj por " "montri paÄon HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2488,11 +2463,11 @@ msgstr "" " --strict-comments Åalti severan (SGML) traktadon de " "komentoj HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rikura akcepto/malakcepto:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2500,7 +2475,7 @@ msgstr "" " -A, --accept=LISTO kom-apartita listo de akcepteblaj " "sufiksoj\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2508,46 +2483,46 @@ msgstr "" " -R, --reject=LISTO kom-apartita listo de malakcepteblaj " "sufiksoj\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGESP regesp kongruanta al akcepteblaj URL-oj\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGESP regesp kongruanta al malakcepteblaj URL-" "oj\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TIPO tipo de regesp (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TIPO tipo de regesp (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTO kom-apartita listo de akcepteblaj " "retregionoj\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTO kom-apartita listo de malakcepteblaj " "retregionoj\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp sekvi ligojn FTP el dokumentoj HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2555,7 +2530,7 @@ msgstr "" " --follow-tags=LISTO kom-apartita listo de sekvataj markoj " "HTML\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2563,20 +2538,20 @@ msgstr "" " --ignore-tags=LISTO kom-apartita listo de preteratentataj " "markoj HTML\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts iri al fremdaj gastigantoj kiam rikura\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sekvi nur relativajn ligojn\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTO listo de permesataj dosierujoj\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2585,84 +2560,84 @@ msgstr "" " --trust-server-names uzi nomon indikitan de la lasta elemento\n" " de la redirektiga URL\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTO listo de forigitaj dosierujoj\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent ne iri supren al la supera dosierujo\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Bonvolu sendi raportojn pri program-misoj kaj sugestojn al \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, ne-interaga reta elÅutilo.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Pasvorto por uzanto %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Pasvorto: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "ne eblas krei dukton" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Pasvorto por uzanto %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokaĵaro: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompili: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Ligo: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2671,29 +2646,29 @@ msgstr "" "GNU Wget %s konstruita en %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (med)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (uzanto)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistemo)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Kopirajto © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2708,7 +2683,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2716,39 +2691,39 @@ msgstr "" "\n" "Originale skribita de Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Bonvolu sendi raportojn pri program-misoj kaj demandojn al .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problemo pri memor-rezervo\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Ni ĉesas pro eraro en %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Provu '%s --help' por pliaj modifiloj.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: malvalida modifilo -- '-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Rafiniga subteno ne estas kompilita. Ni preteratentas flagon --debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2757,7 +2732,7 @@ msgstr "" "Kaj --no-clobber kaj --convert-links estis indikataj, nur --convert-links " "estos uzata.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2766,22 +2741,22 @@ msgstr "" "Kaj --no-clobber kaj --convert-file-only estis indikataj, nur --convert-file-" "only estos uzata.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ne eblas esti detalema kaj silenta samtempe.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Ne eblas temp-marki kaj ne frapi malnovajn dosierojn samtempe.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ne eblas difini kaj --inet4-only kaj --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2793,7 +2768,7 @@ msgstr "" "kun -p aŭ -r. Konsultu la gvidlibron por pli da detaloj.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2803,7 +2778,7 @@ msgstr "" "estos metita en ununura dosiero indikita de vi.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2813,31 +2788,26 @@ msgstr "" "por pli da detaloj.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "La dosiero `%s' jam estas ĉi tie; Äi ne estos elÅutita.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "Eligo de WARC ne funkcias kun --no-clobber, --no-clobber estos malebligata.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Eligo de WARC ne funkcias kun tempindiko, tempindiko estos malebligata.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Eligo de WARC ne funkcias kun --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2846,7 +2816,7 @@ msgstr "" "Eligo de WARC ne funkcias kun --continue aÅ­ --start-pos, ili estos " "malebligataj.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2854,7 +2824,7 @@ msgstr "" "Resumoj estas malebligataj; Multobligo de WARK ne trovos duobligitajn " "rikordojn.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2863,12 +2833,12 @@ msgstr "" "Eligo de WARC ne funkcias kun --continue aÅ­ --start-pos, ili estos " "malebligataj.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ne eblas difini kaj --ask-password kaj --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2877,17 +2847,17 @@ msgstr "" "Indiki samtempe --start-pos kaj --continue ne estas rekomendinde; --continue " "estos malebligata.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: mankanta URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Vi ne povas difini kaj --post-data kaj --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2896,7 +2866,7 @@ msgstr "" "Vi ne povas uzi --post-data aÅ­ --post-file kune kun --method. --method " "postulas datumaron per la modifiloj --body-data kaj --body-file" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2905,24 +2875,24 @@ msgstr "" "Vi devas indiki metodon per --method=HTTPMetodo por uzi kun --body-data aÅ­ --" "body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Vi ne povas difini kaj --body-data kaj --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tiu ĉi versio ne subtenas IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k aÅ­ -r povas esti uzataj kune kun -O nur se eliganta al ordinara dosiero.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2931,42 +2901,42 @@ msgstr "" "--convert-links aÅ­ --convert-file-only povas esti uzataj kune nur se " "eliganta al ordinara dosiero.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Ni fiaskis lanĉi 'libcares'\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ni fiaskis lanĉi kanalon c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ni fiaskis analizi IP-adreson '%s'\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ni fiaskis difini DNS-servilo(j)n '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "URL-oj ne trovitaj en %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ne eblas analizi meta-ligan dosieron %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ne eblis elÅuti ĉiujn rimedojn el %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2977,7 +2947,7 @@ msgstr "" "Totala mur-horloÄa tempo: %s\n" "ElÅutite: %d dosieroj, %s en %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ElÅuta limo de %s TROIGIS!\n" @@ -3138,104 +3108,104 @@ msgstr "La dosiero %s estas elÅutita sed la subskribo ne kongruas. \n" msgid "Renaming %s to %s.\n" msgstr "Ni forviÅas %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Ni daÅ­rigas fone.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Ni daÅ­rigas fone, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Eligo estos skribita al %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() fiaskis\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() fiaskis\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: ne eblis trovi uzeblan ing-pelilon.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() fiaskis. La ingo ne povis esti difinata kiel blokantan.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: averto: la ĵetono %s aperas antaÅ­ iu ajn maÅina nomo\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nekonata ĵetono \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uzmaniero: :%s NETRC [GASTIGANT-NOMO]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne eblas apliki stat al %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "AVERTO: ni uzas malfortan hazardan semon.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ne ebli semi PRNG; konsideru uzi --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Via versio de OpenSSL tro malnovas por subteni TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Via versio de OpenSSL tro malnovas por subteni TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: nerealigita modifil-valoro de 'secure-protocol' %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: ne eblas kontroli atestilon de %s, eldonita de %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ne eblas loke kontroli la aÅ­toritato de la eldonanto.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Mem-signita atestilo estis trovata.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Eldonita atestilo ne validas ankoraÅ­.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Eldonita atestilo malvalidiÄis.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3244,14 +3214,14 @@ msgstr "" "%s: neniu atestila alternativa nomo de temo kongruas al\n" "\tla petita gastigant-nomo %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: atestila komuna nomo %s ne kongruas al la petita gastigant-nomo %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3262,12 +3232,12 @@ msgstr "" " Tio ĉi povas esti indiko ke la gastiganto ne estas kiu Äi diras esti\n" " (tio estas, Äi ne estas la vera %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Por konekti al %s sensekure, uzu '--no-check-certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3276,28 +3246,28 @@ msgstr "" "\n" "%*s[ ni preterpasas %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Malvidala indiko de punkto-stilo %s; ni lasas nemodifita.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " en " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ne eblas scii la frekvencon de horloÄo REALTIME: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Ni forigas %s, ĉar Äi devos esti malakceptata.\n" @@ -3311,22 +3281,22 @@ msgstr "Ne eblas malfermi %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ni Åargas je robots.txt; bonvolu preteratenti erarojn.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eraro dum analizado de prokurila URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Eraro en prokurila URL %s: devas esti HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d rediktegij troigi.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3334,7 +3304,7 @@ msgstr "" "Ni rezignas.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3342,125 +3312,125 @@ msgstr "" "Ni reprovas.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Sen eraro" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nesubtenata Åablono %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Mankas skemo" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Malvalida retnoda nomo" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "MalÄusta pordnumero" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Malvalida uzantnomo" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Nedifinita IPv6 numera adreso" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adreso ne eltenebla" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Malvalida IPv6 numera adreso" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Subteno al HTTPS ne estas enkompilita" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Malkompleta aÅ­ malvalida plurbajta sekvo estis trovata\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: malsukceso rezervi sufiĉe da memoro; memoro estas elĉerpita.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: malsukceso rezervi %ld bajtojn; memoro estas elĉerpita.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: teksta bufro tro grandas (%d bajtoj), ni ĉesas.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ni daÅ­rigas en fona reÄimo, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ni fiaskis forigi simbol-ligon %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Ni fiaskis lanĉi 'libcares'\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Ne eblas preni kuketon por %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Ni fiaskis analizi IP-adreson '%s'\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Ne eblas preni kuketon por %s\n" +msgstr "Ni fiaskis difini DNS-servilo(j)n '%s' (%d)\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Malvalida regul-esprimo %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Eraro dum kongruo al %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3545,6 +3515,37 @@ msgstr "" "Estis trovata Äusta kongruo en dosiero CDX. Ni konservas revizitan rikordon " "al WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: modifilo '--%s' ne permesas argumenton\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: nerekonata modifilo '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: modifilo '-W %s' estas plursenca\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: modifilo '-W %s' ne permesas argumenton\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: modifilo 'W %s' postulas argumenton\n" + +#~ msgid "Invalid UTF-8 sequence: %s\n" +#~ msgstr "Malvalida ĉeno UTF-8: %s\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "idn_decode fiaskis (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s estis ricevata.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "La dosiero `%s' jam estas ĉi tie; Äi ne estos elÅutita.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3565,19 +3566,6 @@ msgstr "" #~ "Ni trovis %d fuÅajn ligojn.\n" #~ "\n" -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "Malvalida ĉeno UTF-8: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "idn_decode fiaskis (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s estis ricevata.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Permeso fiaskis.\n" diff --git a/po/es.gmo b/po/es.gmo index 6edcd99..b330e9d 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 14067cd..07bd86b 100644 --- a/po/es.po +++ b/po/es.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.18\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2016-06-28 22:09+0200\n" "Last-Translator: Carlos E. Robinson \n" "Language-Team: Spanish \n" @@ -38,7 +38,7 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Error de sistema desconocido" @@ -46,7 +46,7 @@ msgstr "Error de sistema desconocido" msgid "Address family for hostname not supported" msgstr "Familia de direcciones para nombredemaquina no soportada" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Fallo temporal en la resolución del nombre" @@ -114,72 +114,47 @@ msgstr "Interrumpido por una señal" msgid "Parameter string not correctly encoded" msgstr "Cadena de parámetros no codificada correctamente" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Error desconocido" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: la opción '%s' es ambigua; posibilidades:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la opción '%s' es ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: la opción '--%s' no admite ningún argumento\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: la opción '%s' es ambigua; posibilidades:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: no se reconoce la opción '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la opción '%c%s' no admite ningún argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la opción '--%s' requiere un argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: no se reconoce la opción '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: no se reconoce la opción '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción inválida -- '%c'\n" # nota jjrs: argumento o parametro? # mmm... argumento? ;-P -Salva -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opción requiere un argumento -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: la opción '-W %s' es ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: la opción '-W %s' no admite ningún argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: la opción '-W %s' requiere un argumento\n" - # # CER, 20101031: según la wikipedia, el primario es «?» y el secundario ???. # He dejado las segundas,, me parecieron más frecuentes. @@ -204,13 +179,13 @@ msgstr "%s: la opción '-W %s' requiere un argumento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -283,28 +258,28 @@ msgstr "Expresión regular demasiado grande" msgid "Unmatched ) or \\)" msgstr ") or \\) desparejado" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "No hay expresión regular previa" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "no se puede crear tubería" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "falló el subproceso %s" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "falló _open_osfhandle" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "no se puede restaurar fd %d: dup2 falló" @@ -324,7 +299,7 @@ msgid "memory exhausted" msgstr "memoria agotada" # CER, 20101031: No traduzco "bind", porque creo que se refiere al programa "bind". -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: no se pudo resolver la dirección \"bind\" %s; desactivando bind.\n" @@ -332,7 +307,7 @@ msgstr "%s: no se pudo resolver la dirección \"bind\" %s; desactivando bind.\n" # Me temo que nadie se "conecta a" sino que se "conecta con", ... ¿no te # suena mejor? - cll # sip - Salva -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Conectando con %s[%s]:%d... " @@ -340,7 +315,7 @@ msgstr "Conectando con %s[%s]:%d... " # Me temo que nadie se "conecta a" sino que se "conecta con", ... ¿no te # suena mejor? - cll # sip - Salva -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Conectando con %s:%d... " @@ -348,36 +323,36 @@ msgstr "Conectando con %s:%d... " # Me temo que nadie se "conecta a" sino que se "conecta con", ... ¿no te # suena mejor? - cll # sip - Salva -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Conectando con [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "conectado.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "falló: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: no se pudo resolver la dirección del equipo %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -411,94 +386,94 @@ msgstr "No se pudo borrar %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "No se pudo hacer una copia de seguridad de %s como %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "No se pudo obtener cookie para %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Error de sintaxis en Set-Cookie: %s en posición %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "El cookie procedente de %s trató de poner el dominio a " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "No se pudo abrir el fichero de cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Error escribiendo a %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Error cerrando %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Tipo de listado no soportado, se intentará con el analizador de listados de " "Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ãndice de /%s en %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "hora desconocida " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fichero " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Directorio " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Enlace " # creo que se refiere al tipo (fichero/directorio/enlace) -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Inseguro " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Longitud: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", quedan %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", quedan %s" @@ -510,17 +485,17 @@ msgstr ", quedan %s" # ¡Dabuti! Si no lo llegas a decir, ... ¡Lo estaba flipando! :) Pero # vamos, siendo como dices, a mí me suena perfectísimamente - cll # -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (probablemente)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "No se pudo iniciar SSL, se desactivará." # mmmm... no estoy seguro de esto... # ¿Así no es mejor? (nl) -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Identificándose como %s ... " @@ -531,9 +506,9 @@ msgstr "Identificándose como %s ... " # a nuestra costumbre - cll # einch! que tengo familiares güiris ;-) , pero tienes razón -Salva # -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Error en la respuesta del servidor, cerrando la conexión de control.\n" @@ -542,7 +517,7 @@ msgstr "Error en la respuesta del servidor, cerrando la conexión de control.\n" # bien - Salva # No está bien, es confuso. Recepción suena a recibir... (nl) # -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Error en el saludo del servidor.\n" @@ -555,8 +530,8 @@ msgstr "Error en el saludo del servidor.\n" # # Además, he añadido el artículo a `conexión' - cll # -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Fallo de escritura, cerrando la conexión de control.\n" @@ -580,7 +555,7 @@ msgstr "Fallo de escritura, cerrando la conexión de control.\n" # equivalente, en todos los mensajes del fichero. Espero que te parezca # oportuno - cll # -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "El servidor ha rechazado el acceso.\n" @@ -588,7 +563,7 @@ msgstr "El servidor ha rechazado el acceso.\n" # usuario, ¿verdad? - cll # sí -Salva # -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Nombre de usuario incorrecto.\n" @@ -596,52 +571,52 @@ msgstr "Nombre de usuario incorrecto.\n" # gracias! :) -Salva # # Preferiría algo como "Conectado" o algo así. sv -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "¡Dentro!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "El servidor no aceptó la orden 'PBSZ 0'.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "El servidor no aceptó la orden 'PROT %c'.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Error del servidor, no se pudo determinar el tipo de sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "hecho. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "hecho.\n" # He añadido el artículo a `conexión' - cll # -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo desconocido `%c', cerrando la conexión de control.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "hecho. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> no se necesita CWD.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Sección lógicamente imposible alcanzada en getftp()" # CER: Pendiente de traducir, si se puede. Creo que no se debe, pueden ser tokens. -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -652,7 +627,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -661,7 +636,7 @@ msgstr "" "No existe el directorio %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> no se requiere CWD.\n" @@ -670,19 +645,19 @@ msgstr "==> no se requiere CWD.\n" # CER, 20101031: no sé cual era el texto inglés original de ese comentario (ahora está en fuzzy), en la actualidad parece demasiado largo. -> Ah, es que es una traducción automática de otro msgid con comentario y todo: # File %s already there; not retrieving.\n # El fichero `%s' ya está ahí, no se recupera.\n -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "El fichero ya fué recuperado.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "No se pudo iniciar la trasferencia PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "No se pudo analizar la respuesta PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "no se pudo conectar con %s puerto %d:%s\n" @@ -699,17 +674,17 @@ msgstr "no se pudo conectar con %s puerto %d:%s\n" # # CER, 20101031: si es una llamada a función, entonces falta una "a" # -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Error en la llamada a “bind†(%s).\n" # Ya no está "prohibido" usar esta palabra. sv -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PUERTO inválido.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -717,17 +692,17 @@ msgstr "" "\n" "El comando REST no funcionó, se empezará desde el principio\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "El fichero %s existe.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "No existe tal fichero %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -736,7 +711,7 @@ msgstr "" "No existe tal fichero %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -745,34 +720,34 @@ msgstr "" "No existe tal fichero o directorio %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s de repente existe.\n" # He añadido el artículo a `conexión' - cll # -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, cerrando la conexión de control.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Conexión de datos: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Conexión de control cerrada.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Trasferencia de datos abortada.\n" # `no recuperando' no me suena muy español, te propongo la alternativa # más "humanizada", `no se recupera' - cll -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "El fichero %s ya está ahí, no se recupera.\n" @@ -780,12 +755,12 @@ msgstr "El fichero %s ya está ahí, no se recupera.\n" # nota jjrs: no sería mejor intento? # pues sí - Salva # decididamente si - cll -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -794,7 +769,7 @@ msgstr "" "%s (%s) - escritos a stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -803,13 +778,13 @@ msgstr "" "%s (%s) - %s guardado [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Eliminando %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Usando %s como fichero temporal de listado.\n" @@ -818,24 +793,24 @@ msgstr "Usando %s como fichero temporal de listado.\n" # emplean con frecuencia para adjetivar un sustantivo, sin embargo, en # español sirven para hacer referencia a una acción. Esto es, deben ir # después del sustantivo - cll -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s eliminado.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "La profundidad de recursión %d excedió la máxima de %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "El fichero remoto no es más moderno que el fichero local %s -- no se " "descargará.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -845,7 +820,7 @@ msgstr "" "\n" # CER, 20101031: cambio recuperando por descargando por consistencia con otros. Tiene pinta de ser una copia de otro msg de otra linea. -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -858,11 +833,11 @@ msgstr "" # expresadas en gerundio, ..., prefiero una forma impersonal como `se # omite' - cll # -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "El nombre del enlace simbólico no es válido, se omite.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -871,40 +846,40 @@ msgstr "" "Ya se tiene el enlace simbólico correcto %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creando enlace simbólico %s -> %s\n" # Lo dicho de los gerundios por formas impersonales - cll -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "No se admiten enlaces simbólicos, se omite el enlace simbólico %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Omitiendo el directorio %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo de fichero desconocido/no soportado.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "No se pudo obtener cookie para %s\n" # sigo las indicaciones del texto "pifias" para time-stamp. # CER: 20101118: No se a que se refiere, en gugle sólo sale este .po con esa frase. -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: marca-de-tiempo corrupta.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" @@ -913,17 +888,17 @@ msgstr "" # Los gerundios me parecen poco apropiados para construir predicados # normales y corrientes como intentas en este mensaje. En su lugar, te # propongo la forma alternativa `se desciende' - cll -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "No se desciende hasta %s por estar excluido/no-incluido.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Rechazando %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Error ajustando %s a %s: %s\n" @@ -936,194 +911,194 @@ msgstr "Error ajustando %s a %s: %s\n" # mensaje que habeis puesto me parece una traducción excelente - cll# # Algo no es *parecido* a un patrón. Algo *cumple* con un patrón. (nl) # Bien, pero aceptaré la matización cd C.S. Suarez de 'se ajusta a...' -Salva# -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "No hay nada que se ajuste al patrón %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Se escribió un índice en HTML a %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Se escribió un índice en HTML a %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: No se puede abrir el directorio %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: No se pudo abrir certificado %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Cargado certificado CA '%s'\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERROR: Fallo al abrir fichero de CRL '%s': (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Cargado fichero CRL '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ERROR: GnuTLS requiere que la llave y el certificado sean del mismo tipo.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: valor de opción %d de 'secure-protocol' no implementada\n" # CER, 201011117: Yo traduzco bugs por gazapo, en vez de "bichos" :-) # (acepcion 2.2 de ) -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Por favor, reporte éste problema a bug-wget@gnu.org.\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: valor de opción %d de 'secure-protocol' no implementada\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s no ha presentado certificado.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: El certificado de %s no es confiable.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: El certificado de %s no tiene un emisor conocido.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: El certificado de %s ha sido revocado.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: El signatario del certificado de %s no es una AC.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: El certificado de %s fue firmado usando un algoritmo inseguro.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: El certificado de %s no está aún activado.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: El certificado de %s ha expirado.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Error inicializando el certificado X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "No se encontró certificado\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Error analizando el certificado: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "El certificado no ha sido aún activado\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Ha expirado el certificado\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "El propietario del certificado no se ajusta al nombre de equipo %s\n" # CER, 2016-06-28 No se como traducir correctamente "pinned". Ningún idioma lo ha traducido todavía. Es cogido o clavado con un alfiler. Enchavetar. Clavar. Enclavijar. -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "¡La clave pública no encaja con la clave enchavetada!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "El certificado debe ser X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Error en el manejo de la lista de direcciones.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Equipo desconocido" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Resolviendo %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "falló: No se encontraron las direcciones Ipv4/IPv6 del equipo.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "falló: temporizó.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: no se pudo resolver el enlace incompleto %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL inválida %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Fallo escribiendo petición HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Sin cabeceras, supondremos HTTP/0.9" # `no recuperando' no me suena muy español, te propongo la alternativa # más "humanizada", `no se recupera' - cll -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1132,11 +1107,11 @@ msgstr "" "El fichero %s ya está ahí, no se recupera.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "Falló gmtime. Probablemente sea un gazapo.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1145,27 +1120,27 @@ msgstr "" "0 como el momento de la última modificación.\n" # CER, 20101031: no se si el sentido de missing aquí es perdido o que falta. -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "El fichero de datos BODY %s falta: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizando la conexión existente a [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizando la conexión con %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Fallo leyendo la respuesta del proxy: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" @@ -1175,32 +1150,32 @@ msgstr "%s ERROR %d: %s.\n" # Como no existe el verbo "malformar" en español, el participio # `malformado' es incorrecto. El único término parecido a éste que # existe en español es `malformación'. - cll -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Línea de estado mal formada" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Falló la tunelización proxy: %s" # CER: 20101118 ¿Método o esquema? -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Esquema de autentificación desconocido.\n" # CER: 20101118 ¿Método o esquema? -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Autenticación seleccionada: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Grabando a: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1209,22 +1184,22 @@ msgstr "" "Mientras se descargaba la firma:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "No se puede leer la el contenido de la firma desde el fichero temporal. " "Omitiendo.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "No se pudo crear fichero temporal. Omitiendo descarga de la firma.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valor pri inválido. Asumiendo %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1232,45 +1207,45 @@ msgstr "" "No se pudo encontrar resumen aceptable para los recursos Metalink.\n" "Ignorándolos.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Desactivando SSL debido a los errores encontrados.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Petición %s enviada, esperando respuesta... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "No se han recibido datos.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Error de lectura (%s) en las cabeceras.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sin descripción)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Localización: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "no especificado" # Duda: Hmmm, ... ¿`siguiendo' o `siguiente'? - cll # siguiendo - Salva # -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [siguiendo]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1279,7 +1254,7 @@ msgstr "" "Fichero %s no modificado en el servidor. Omitiendo la descarga.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1290,7 +1265,7 @@ msgstr "" "Podría úd intentar añadir la opción --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1300,59 +1275,59 @@ msgstr "" " El fichero ya ha sido totalmente recuperado, no hay nada que hacer.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Longitud: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "descartado" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: no se admiten comodines en HTTP.\n" # CER, 20101031: ¿Admitimos humor? ?Modo arácnido? ;-) -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modo arácnido activado. Comprobar si el fichero remoto existe.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "No se puede escribir a %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Recibido el atributo requerido que faltaba de la cabecera.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "La autentificación usuario/contraseña falló.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "No se puede escribir en fichero WARC..\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "No se puede escribir en fichero WARC temporal.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "No se pudo establecer la conexión SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "No se puede des-enlazar %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: redirección (%d) sin localización.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1360,29 +1335,29 @@ msgstr "" "No se pudo encontrar los datos Metalink en la respuesta HTTP. Descargando el " "fichero usando HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Se han encontrado cabeceras Metalink. Cambiando a modo Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "No existe el fichero remoto -- ¡¡¡enlace roto!!!\n" # así se entiende mejor -Salva # CER, 20101031: Mejor así: Falta la fecha de -> Falta la cabecera de fecha de ; y apagadas -> desactivadas -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Falta la cabecera de fecha de la última modificación -- marcas de tiempo " "desactivadas.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "La cabecera de fecha de última modificación es inválida -- marca de tiempo " "descartada.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1392,16 +1367,16 @@ msgstr "" "descargará.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Los tamaños no concuerdan (%s local) -- recuperando.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "El fichero remoto es más nuevo, recuperando.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1411,7 +1386,7 @@ msgstr "" "descargando.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1419,7 +1394,7 @@ msgstr "" "El fichero remoto existe pero no contiene ningún enlace -- no se " "descargará.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1429,7 +1404,7 @@ msgstr "" "pero la recursión está desactivada -- no se recupera.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1437,12 +1412,12 @@ msgstr "" "El fichero remoto existe.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1451,7 +1426,7 @@ msgstr "" "%s (%s) - escritos a stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1460,58 +1435,58 @@ msgstr "" "%s (%s) - %s guardado [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión cerrada en el byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Error de lectura en el byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Error de lectura en el byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Calidad de protección no soportada '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo no soportado '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC apunta a %s, el cual no existe.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: No se pudo leer %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Error en %s en la línea %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Error de sintaxis en %s en la línea %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: orden desconocida %s en %s en línea %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1523,7 +1498,7 @@ msgstr "" "'%s',\n" "o especifique un fichero diferente usando --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1535,81 +1510,81 @@ msgstr "" "o especifique un fichero diferente usando --config.\n" # CER, 20101031: cambio atención por aviso (warning), por consistencia. -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Aviso: tanto el fichero wgetrc de usuario como el del sistema apuntan a " "%s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Inválido --ejecute orden %s\n" # Te cambio la `o' antes de `off' por `u' - cll -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: booleano inválido %s; use `on' u `off'.\n" # Te cambio la `o' antes de `off' por `u' - cll -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: el %s es inválido; usa `on', `off' o `quiet'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: número inválido %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s sólo debe usarse una vez\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: valor byte inválido %s.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: periodo de tiempo inválido %s.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: valor %s inválido.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: cabecera %s inválida.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: cabecera WARC inválida %s.\n" # CER, 20101031: No estoy seguro si estas cadenas debo poner la ultima %s en el centro o al final, porque no se si es una palabra o valor o una frase. -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: tipo de progreso %s inválido.\n" # CER, 20101031: creo que son tokens, no traducibles. -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1618,40 +1593,40 @@ msgstr "" "%s: %s: restricción %s inválida,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "La codificación %s no es válida\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "La conversión de %s a %s no está soportada\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Secuencia multibyte incompleta o inválida\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "error %d no manejado\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: locale está desactivado\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "falló idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "no se pudo conectar con %s puerto %d:%s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1660,12 +1635,12 @@ msgstr "" "\n" "%s recibido, redirigiendo la salida a %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deshabilitando el registro.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [URL]...\n" @@ -1675,7 +1650,7 @@ msgstr "Modo de empleo: %s [OPCIÓN]... [URL]...\n" # misma línea, ... - cll # Hombre, así debería quedar bastante mejor (además creo que no es la única vez # que lo he hecho), espero que no de problemas. - Salva -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1684,62 +1659,62 @@ msgstr "" "obligatorios para las opciones cortas.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Inicio:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version muestra la versión de Wget y sale\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help muestra esta ayuda\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background se va a segundo plano después de empezar\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMAND ejecuta una orden estilo `.wgetrc'\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Ficheros de registro y de entrada:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FICHERO registra mensajes en FICHERO\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE anexa mensajes a FILE\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug saca montones de información para " "depuración\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug saca salida de depuración Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet silencioso (sin texto de salida)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose sé verboso (es el método por defecto)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1747,7 +1722,7 @@ msgstr "" " -nv, --no-verbose desactiva modo verboso, sin ser " "silencioso\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1755,7 +1730,7 @@ msgstr "" " --report-speed=TYPE Ancho de banda de salida como TYPE. \n" " TYPE puede ser bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1764,7 +1739,7 @@ msgstr "" "(FILE)\n" " local o externo\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1773,12 +1748,12 @@ msgstr "" "(FILE) local\n" " o externo de metalinks\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html trata el fichero de entrada como HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1787,29 +1762,29 @@ msgstr "" "entrada\n" " (-i -F) relativos a la URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FILE Especifica el fichero de configuración a " "usar\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config no lee ningún fichero de configuración\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FICHERO Registra las razones para rechazo de URL " "en FICHERO\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Descarga:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1817,19 +1792,19 @@ msgstr "" " -t, --tries=NÚMERO define número de intentos a NÚMERO\n" " (0 es sin limite)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused reintenta incluso si la conexión es " "rechazada\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" " -O, --output-document=FILE escribe documentos al fichero FILE\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1838,7 +1813,7 @@ msgstr "" " ficheros existentes " "(sobrescribiéndolos)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1846,7 +1821,7 @@ msgid "" msgstr "" " --no-config no lee ningún fichero de configuración\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1854,7 +1829,7 @@ msgstr "" " -c, --continue continua una descarga parcial de un " "fichero\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1862,12 +1837,12 @@ msgstr "" " --start-pos=OFFSET inicia la descarga desde la posición de\n" " base-cero OFFSET\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE selecciona tipo de indicador de progreso\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1876,7 +1851,7 @@ msgstr "" "cualquier\n" " modo de verbosidad\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1885,7 +1860,7 @@ msgstr "" " -N, --timestamping no re-recupera ficheros a menos que sean\n" " más nuevos que la versión local\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1895,7 +1870,7 @@ msgstr "" "modified-since\n" " en modo de sellado de tiempo\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1903,21 +1878,21 @@ msgstr "" " --no-use-server-timestamps no pone la hora/fecha del fichero local\n" " a la que tenga el servidor\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response muestra la respuesta del servidor\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider (araña) no descarga nada\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEGUNDOS pone todos los valores de temporización\n" " a SEGUNDOS\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1926,7 +1901,7 @@ msgstr "" "preguntar\n" " (separados por comas)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1934,30 +1909,30 @@ msgstr "" " --bind-dns-address=DIRECCN enlazar resolvedor DNS resolver a DIRECCN " "(nombredeequipo o IP) en equipo local\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEGS define la temporización de la búsqueda\n" " DNS a SEGS\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEGS define la temporización de conexión a " "SEGS\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEGS define la temporización de lectura a " "SEGS\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEGUNDOS espera tantos SEGUNDOS entre reintentos\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1965,7 +1940,7 @@ msgstr "" " --waitretry=SEGUNDOS espera 1..SEGUNDOS entre reintentos\n" " de una descarga\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1973,17 +1948,17 @@ msgstr "" " --random-wait espera entre 0.5*WAIT...1.5*WAIT segs.\n" " entre descargas\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy explícitamente desconecta el proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NÚMERO define la cuota de descarga a NÚMERO\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1991,16 +1966,16 @@ msgstr "" " --bind-address=DIRECCIÓN bind a DIRECCIÓN (nombredeequipo o IP) en " "equipo local\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=VELOCIDAD limita velocidad de descarga a VELOCIDAD\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache desactiva búsquedas en tampón DNS\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -2009,7 +1984,7 @@ msgstr "" "ficheros\n" " a los que el SO permita\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -2017,15 +1992,15 @@ msgstr "" " --ignore-case ignora mayús/minúsculas al encajar " "ficheros/directorios\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conecta sólo a direcciones IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conecta sólo a direcciones IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -2036,24 +2011,24 @@ msgstr "" " especificada, bien IPv6, IPv4, o " "ninguna\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=USUARIO pone el usuario de ambos ftp y http a " "USUARIO\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=CONTRASEÑA pone la contraseña de ambos ftp y http a " "CONTRASEÑA\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pide las contraseñas\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -2064,11 +2039,11 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri desactiva soporte IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" @@ -2076,32 +2051,30 @@ msgstr "" "codificación\n" " local para IRIs\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC usa ENC como la codificación remota por " "defecto\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink borra fichero antes de machacar\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=NÚMERO define la cuota de descarga a NÚMERO\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -2109,7 +2082,7 @@ msgstr "" " --metalink-over-http usa metadatos Metalink de las cabeceras " "de la respuesta HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -2117,7 +2090,7 @@ msgstr "" " --preferred-location localización preferida para los recursos " "Metalink\n" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " @@ -2126,33 +2099,33 @@ msgstr "" " --no-glob desactiva generación de nombres de\n" " fichero del FTP (globbing)\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Directorios:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories no crea directorios\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories fuerza la creación de directorios\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories no crea directorios del anfitrión\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usa nombre de protocolo en los " "directorios\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIJO graba los ficheros en PREFIJO/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2160,25 +2133,25 @@ msgstr "" " --cut-dirs=NÚMERO ignora NÚMERO de componentes de\n" " directorio remoto\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opciones HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USUARIO pone el usuario http a USUARIO\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS pone la contraseña http a PASS\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache no permite los datos en tampón del " "servidor\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2186,7 +2159,7 @@ msgstr "" " --default-page=NAME Cambia el nombre de página por defecto\n" " (suele ser `index.html'.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2194,19 +2167,19 @@ msgstr "" " -E, --adjust-extension graba documentos HTML/CSS con las " "extensiones correctas\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignora campo `Content-Length' en " "cabeceras\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRING inserta STRING entre las cabeceras\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2214,25 +2187,25 @@ msgid "" msgstr "" " --progress=TYPE selecciona tipo de indicador de progreso\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect máximo de redirecciones permitidas por " "página\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=USUARIO pone USUARIO como nombre de usuario del " "proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASS pone PASS como contraseña del proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2240,12 +2213,12 @@ msgstr "" " --referer=URL incluye cabecera `Referer: URL' en " "petición HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers graba las cabeceras HTTP a fichero\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2253,7 +2226,7 @@ msgstr "" " -U, --user-agent=AGENTE se identifica como AGENTE en vez de Wget/" "VERSIÓN\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2261,24 +2234,24 @@ msgstr "" " --no-http-keep-alive desactiva HTTP keep-alive (conexiones " "persistentes)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies no usa \"cookies\"\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FICHERO carga las \"cookies\" desde FICHERO antes " "de la sesión\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FICHERO graba las \"cookies\" a FICHERO después " "de la sesión\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2286,7 +2259,7 @@ msgstr "" " --keep-session-cookies carga y graba las \"cookies\" de sesión " "(no-permanentes)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2294,7 +2267,7 @@ msgstr "" " --post-data=STRING usa el método POST; envía STRING como los " "datos\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2302,13 +2275,13 @@ msgstr "" " --post-file=FICHERO usa el método POST; envía el contenido de " "FICHERO\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod usa método \"HTTPMethod\" en la cabecera\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2316,7 +2289,7 @@ msgstr "" " --body-data=STRING Envía STRING como datos. Debe usarse --" "method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2324,7 +2297,7 @@ msgstr "" " --body-file=FICHERO Envía el contenido de FICHERO. Debe " "usarse --method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2336,7 +2309,7 @@ msgstr "" " cuando se elige nombre de ficheros " "locales (EXPERIMENTAL)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2344,7 +2317,7 @@ msgstr "" " --content-on-error imprime el contenido recibido si hay " "errores del servidor\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2356,11 +2329,11 @@ msgstr "" " sin antes esperar al desafío del " "servidor\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opciones HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2371,41 +2344,41 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 y PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only sigue sólo enlaces HTTPS seguros\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate no valida el certificado del servidor\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=FILE fichero de certificado del cliente\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE tipo de certificado de cliente, PEM o " "DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE fichero de llave privada\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TYPE tipo de llave privada, PEM o DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FILE fichero con la agrupación de CAs\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2413,11 +2386,11 @@ msgstr "" " --ca-directory=DIR directorio donde se guarda la lista \"hash" "\" de CAs\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FICHERO fichero con la agrupación de CRLs\n" -#: src/main.c:840 +#: src/main.c:849 #, fuzzy msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" @@ -2435,7 +2408,7 @@ msgstr "" "separados\n" " por ';', para verificar contra el par\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2443,7 +2416,7 @@ msgstr "" " --random-file=FILE fichero con datos aleatorios como semilla " "de SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2451,17 +2424,17 @@ msgstr "" " --egd-file=FICHERO fichero que denomina el conector EGD con " "datos aleatorios\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Opciones HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache no permite los datos en tampón del " "servidor.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2469,11 +2442,11 @@ msgstr "" " --hsts-file camino de la base de tados HSTS " "(invalidará las opciones por omisión)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opciones FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2481,39 +2454,39 @@ msgstr "" " --ftp-stmlf Usa formato Stream_LF para todos los " "ficheros binarios FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=USUARIO pone USUARIO como el usuario de ftp\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS pone PASS como contraseña ftp\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing no elimina los ficheros `.listing'\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob desactiva generación de nombres de\n" " fichero del FTP (globbing)\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp desactiva el modo \"pasivo\" de " "transferencia\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preserva permisos de ficheros remotos\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2521,11 +2494,11 @@ msgstr "" " --retr-symlinks en modo recursivo, descarga los ficheros\n" " enlazados (no los directorios)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Opciones FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2533,7 +2506,7 @@ msgstr "" " --ftps-implicit use FTPS implícito (el puerto por " "omisión es el990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2544,7 +2517,7 @@ msgstr "" " conexión de control al abrir una " "conexión de datos\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2552,7 +2525,7 @@ msgstr "" " --ftps-clear-data-connection cifra sólo el canal de control; todos " "los datos irán en texto claro\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2560,11 +2533,11 @@ msgstr "" " --ftps-fallback-to-ftp retrae a FTP si FTPS no es soportado " "por el servidor objetivo\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opciones WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2572,24 +2545,24 @@ msgstr "" " --warc-file=FILENAME guarda datos de la petición/respuesta en " "un fichero .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRING inserta STRING en registro warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMBER define tamaño máximo de ficheros WARC a " "NUMBER\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx escribe ficheros indice CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2598,17 +2571,17 @@ msgstr "" "en\n" " este fichero CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression no comprime ficheros WARC con GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests no calcula resúmenes SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2616,7 +2589,7 @@ msgstr "" " --no-warc-keep-log no guarda el fichero de registro en un " "campo WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2625,15 +2598,15 @@ msgstr "" " --warc-tempdir=DIRECTORY localización para ficheros temporales\n" " creada por el grabador de WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Descarga recursiva:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive especifica descarga recursiva\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2641,7 +2614,7 @@ msgstr "" " -l, --level=NUMBER máxima profundidad de recursión (inf o 0 " "para infinita)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2649,7 +2622,7 @@ msgstr "" " --delete-after borra los ficheros localmente después de " "descargarlos\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2658,7 +2631,7 @@ msgstr "" " -k, --convert-links hace que los enlaces en el HTML o CSS\n" " descargado apunte a ficheros locales\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2666,7 +2639,7 @@ msgstr "" " --convert-file-only convertir sólo la parte del fichero de " "las URLs (normalmente conocido como el basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2675,7 +2648,7 @@ msgstr "" "hasta un\n" " máximo de N ficheros de respaldo\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2684,7 +2657,7 @@ msgstr "" "salvaguardarlo\n" " como X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2693,7 +2666,7 @@ msgstr "" "salvaguardarlo\n" " como X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2701,7 +2674,7 @@ msgstr "" " -m, --mirror atajo para -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2709,7 +2682,7 @@ msgstr "" " -p, --page-requisites descarga todas las imágenes, etc. que se\n" " necesitan para mostrar la página HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2717,11 +2690,11 @@ msgstr "" " --strict-comments activa manejo estricto (SGML) de los " "comentarios en HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Acepta/rechaza recursivamente:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2729,7 +2702,7 @@ msgstr "" " -A, --accept=LIST lista separada por comas de extensiones " "aceptadas\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2737,46 +2710,46 @@ msgstr "" " -R, --reject=LIST lista separada por comas de extensiones " "rechazadas\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX regex que encaja en las URLS aceptadas\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX regex que encaja las URLs rechazadas\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE tipo de regex (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE tipo de regex (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST lista separada por comas de dominios " "aceptados\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST lista separada por comas de dominios " "rechazados\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp sigue los enlaces a FTP de los documentos " "HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2784,7 +2757,7 @@ msgstr "" " --follow-tags=LIST lista separada por comas de etiquetas " "HTML a seguir\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2792,21 +2765,21 @@ msgstr "" " --ignore-tags=LIST lista separada por comas de etiquetas " "HTML a ignorar\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts va a equipos extraños en el recorrido " "recursivo\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sólo sigue enlaces relativos\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIST lista de directorios permitidos\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2816,81 +2789,81 @@ msgstr "" "redirección \n" " del último componente de la url\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST lista de directorios excluidos\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent no asciende al directorio padre\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Envíe información sobre gazapos y sugerencias a \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, un recuperador por red no interactivo.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Contraseña para el usuario %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Contraseña: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "no se puede crear tubería" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contraseña para el usuario %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Compila: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Enlaza: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2900,29 +2873,29 @@ msgstr "" "\n" # CER: No estoy seguro si debo poner "entrno" y no "entorno" porque parece que quieren abreviaturas (usan env y no environment) -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (entorno)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (usuario)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (©) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2937,7 +2910,7 @@ msgstr "" # CER, 201011117: No veo tal cosa, ni existe en_US.po #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2947,38 +2920,38 @@ msgstr "" # CER, 201011117: Yo traduzco bugs por gazapo, en vez de "bichos" :-) # (acepcion 2.2 de ) -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Envíe informes de gazapos y preguntas a .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problema de ubicación de memoria\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Saliendo debido a error en %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pruebe `%s --help' para ver más opciones.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opción ilegal -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "El soporte de compilación no ha sido compilado. Ignorando la bandera --" "debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2987,7 +2960,7 @@ msgstr "" "Ambos --no-clobber y --convert-links fueron especificados, sólo se usará --" "convert-links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -3001,25 +2974,25 @@ msgstr "" # # CER, 201011117: Era: No se puede ser verboso ofrecer información y estar silencioso al mismo tiempo. # CER, 201011117: cambio: No se puede ser verboso y silencioso al mismo tiempo -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "No se puede ser verboso y silencioso al mismo tiempo.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "No se pueden usar marcas de tiempo y no sobreescribir ficheros viejos al " "mismo tiempo.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "No se puede especificar al mismo tiempo ambos --inet4-only e --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -3031,7 +3004,7 @@ msgstr "" "en combinación con -p o -r. Vea el manual para los detalles.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -3042,7 +3015,7 @@ msgstr "" "se situará en el único fichero que ha especificado.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -3053,22 +3026,14 @@ msgstr "" "para los detalles.\n" "\n" -# `no recuperando' no me suena muy español, te propongo la alternativa -# más "humanizada", `no se recupera' - cll -# CER, 201011117: Me parece más apropiado "descargar", ¿no? -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "El fichero `%s' ya está ahí; no se descarga.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "La salida WARC no funciona con --no-clobber, --no-clobber será desactivada.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -3076,12 +3041,12 @@ msgstr "" "La salida WARC no funciona con marcas de tiempo, las marcas de tiempo serán " "desactivadas.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "La salida WARC no funciona con --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -3089,7 +3054,7 @@ msgid "" msgstr "" "La salida WARC no funciona con --continue, --continue será desactivado.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3097,7 +3062,7 @@ msgstr "" "Los resúmenes están desactivados; deduplicación WARC no encontrará\n" "registros duplicados.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3105,12 +3070,12 @@ msgid "" msgstr "" "La salida WARC no funciona con --continue, --continue será desactivado.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "No se puede especificar ambos --ask-password y --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3119,17 +3084,17 @@ msgstr "" "No se recomienda especificar al mismo tiempo --start-pos y --continue; --" "continue será desactivada.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta la URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "No se puede especificar ambos --post-data and --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3138,7 +3103,7 @@ msgstr "" "No puede usar --post-data o --post-file al mismo tiempo que --method. --" "method espera datos a través de las opciones --body-data y --body-file" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3147,18 +3112,18 @@ msgstr "" "Debe especificar un método a través de --method=HTTPMethod para usarse con --" "body-data o --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" "No se puede especificar al mismo tiempo ambos --body-data y --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Esta versión no tiene soporte para IRIs\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3166,7 +3131,7 @@ msgstr "" "-k o -r puede ser usado junto con -O sólo si la salida va a un fichero " "regular.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3175,37 +3140,37 @@ msgstr "" "--convert-links o --convert-file-only pueden ser usados juntos sólo si la " "salida va a un fichero regular.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "No se pudo inicializar libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "No se pudo inicializar el canal c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "No se pudo analizar dirección IP '%s'\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "No se pudo poner el(los) servidor(es) DNS '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "No se han encontrado URLs en %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "No se pudo analizar el fichero metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "No se pudo descargar todos los recursos desde %s\n" @@ -3213,7 +3178,7 @@ msgstr "No se pudo descargar todos los recursos desde %s\n" # `Bajados' es una traducción demasiado literal. Como en uno de los # mensajes de ayuda que hay más arriba, y para ser coherente, con lo que # allí te sugiero, te propongo ahora también `descargados' - cll -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3226,7 +3191,7 @@ msgstr "" # ¡Efectivamente! Ahora lo has puesto tu, ... `download'=`descarga' - # cll -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "¡Cuota de descarga de %s EXCEDIDA!\n" @@ -3392,28 +3357,28 @@ msgstr "Eliminando %s.\n" # Lo mismo que antes, ... `background' es `segundo plano' - cll # -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Continuando en segundo plano.\n" # Lo mismo que antes, ... `background' es `segundo plano' - cll -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Continuando en segundo plano, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "La salida será escrita a %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() falló\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() falló\n" @@ -3422,19 +3387,19 @@ msgstr "fake_fork() falló\n" # Si, este es uno de esos casos que se dan por imposibles ya, ... Todo # el mundo utilizamos `socket' "asinque" nada, ... - cll# # CER, 201011117: Yo estaba traduciendo socket por conector. -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: No se ha podido encontrar un controlador de conector utilizable\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() falló. El conector no pudo ponerse como bloqueante..\n" # Simplemente, te cambio un par de palabras de sitio, a ver si así te # gusta más, ... - cll -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" @@ -3448,12 +3413,12 @@ msgstr "" # traducido en informática como `símbolo'. La traducción, por lo tanto, # es correcta - cll # -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: símbolo desconocido \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Modo de empleo: %s NETRC [NOMBREDEMÃQUINA]\n" @@ -3462,54 +3427,54 @@ msgstr "Modo de empleo: %s NETRC [NOMBREDEMÃQUINA]\n" # nota jjrs: stat es una función de C que obtiene datos de un archivo # y en esta parte solamente lo usa para checar si existe el archivo # pero el wget no utiliza esta función. -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: no se pudo ejecutar “stat†sobre %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: usando una semilla aleatoria débil.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "No se pudo sembrar el PRNG; considere usar --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Su versión de OpenSSL es demasiado antigua para soportar TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Su versión de OpenSSL es demasiado antigua para soportar TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: valor de opción %d de 'secure-protocol' no implementada\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: no se puede verificar el certificado de %s, emitido por %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Imposible verificar localmente la autoridad emisora.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Certificado auto-firmado encontrado.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " El certificado emitido no es aún válido.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " El certificado emitido ha expirado.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3518,7 +3483,7 @@ msgstr "" "%s: ningún nombre de sujeto alternativo del certificado encaja con\n" "\tel nombre de equipo %s solicitado.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3526,7 +3491,7 @@ msgstr "" " %s: el nombre común %s del certificado no encaja con el nombre de equipo " "%s solicitado.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3538,14 +3503,14 @@ msgstr "" " Ésto puede ser una indicación de que el equipo no es quien dice ser\n" " (o sea, que no es el verdadero %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Para conectar inseguramente a %s, use `--no-check-certificate'.\n" # Como en otros mensajes anteriores te recomiendo que emplees el término # `omitir' en vez de `saltar' para `skip' - clldigits in the skipped amount in K. -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3555,7 +3520,7 @@ msgstr "" "%*s[ omitiendo %sK ] " # CER, 201011117: explicación de lo que es "dot" en el código fuente. -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3563,21 +3528,21 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " en " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "No se puede obtener frecuencia de reloj REALTIME: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Eliminando %s puesto que debería ser rechazado.\n" @@ -3591,22 +3556,22 @@ msgstr "No se puede abrir %s: %s " msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; por favor ignore los errores.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Error analizando la URL del proxy %s: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Error en la URL del proxy %s: Debe ser HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Sobrepasadas las %d redirecciones.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3614,7 +3579,7 @@ msgstr "" "Abandonando.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3622,128 +3587,128 @@ msgstr "" "Reintentando.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "No hay error" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Esquema %s no soportado" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Falta esquema" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Nombre de equipo inválido" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Mal número de puerto" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Nombre de usuario inválido" # CER 20101118 - pone unterminated, y el token del código fuente igual. Debe ser correcto. -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Dirección numérica IPv6 sin terminar" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Direcciones IPv6 no soportadas" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Dirección numérica IPv6 inválida" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "El soporte HTTPS no ha sido compilado" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Secuencia multibyte incompleta o inválida\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Fallo al adjudicar suficiente memoria; memoria agotada.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Fallo al adjudicar %ld bytes; memoria agotada.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: tampón de texto es demasiado grande (%d bytes), abortando.\n" # Lo mismo que antes, ... `background' es `segundo plano' - cll -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando en segundo plano, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Fallo al desligar el enlace simbólico %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "No se pudo inicializar libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "No se pudo obtener cookie para %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "No se pudo obtener cookie para %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "No se pudo analizar dirección IP '%s'\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "No se pudo obtener cookie para %s\n" +msgstr "No se pudo poner el(los) servidor(es) DNS '%s' (%d)\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expresión regular inválida %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Error mientras encajando %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3828,6 +3793,40 @@ msgstr "" "Dato exacto encontrado en el fichero CDX. Grabando registro de revisitas a " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '--%s' no admite ningún argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: no se reconoce la opción '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: la opción '-W %s' es ambigua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '-W %s' no admite ningún argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: la opción '-W %s' requiere un argumento\n" + +#~ msgid "Invalid UTF-8 sequence: %s\n" +#~ msgstr "Secuencia UTF-8 inválida %s\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "falló idn_decode (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s recibido.\n" + +# `no recuperando' no me suena muy español, te propongo la alternativa +# más "humanizada", `no se recupera' - cll +# CER, 201011117: Me parece más apropiado "descargar", ¿no? +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "El fichero `%s' ya está ahí; no se descarga.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3848,19 +3847,6 @@ msgstr "" #~ "Encontrados %d enlaces rotos.\n" #~ "\n" -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "Secuencia UTF-8 inválida %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "falló idn_decode (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s recibido.\n" - # En vez de `falló la autorización' me parece más apropiado # `Autorización denegada' - cll # diff --git a/po/et.gmo b/po/et.gmo index b9a7afb..9e40759 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 113a784..0a77148 100644 --- a/po/et.po +++ b/po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-17 19:42+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Tundmatu süsteemne viga" @@ -26,7 +26,7 @@ msgstr "Tundmatu süsteemne viga" msgid "Address family for hostname not supported" msgstr "Seda aadresside perekonda ei toetata" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Nime lahendamisel tekkis ajutine viga" @@ -94,70 +94,45 @@ msgstr "Katkestatud signaali poolt" msgid "Parameter string not correctly encoded" msgstr "Parameetri sõne ei ole korrektselt kodeeritud" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Tundmatu viga" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: võti '%s' on arusaamatu; variandid:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: võti '%s' on segane\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: võti '--%s' ei luba argumenti\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: võti '%s' on arusaamatu; variandid:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: tundmatu võti '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: võti '%c%s' ei luba argumenti\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: võti '--%s' nõuab argumenti\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: tundmatu võti '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: tundmatu võti '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: vigane võti -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: võti nõuab argumenti -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: võti '-W %s' on segane\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: võti '-W %s' ei luba argumenti\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: võti '-W %s' nquab argumenti\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -177,13 +152,13 @@ msgstr "%s: võti '-W %s' nquab argumenti\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -255,28 +230,28 @@ msgstr "Regulaaravaldis on liiga suur" msgid "Unmatched ) or \\)" msgstr ") või \\) paariline puudub" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Eelmist regulaaravaldist pole" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "toru ei õnnestu luua" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s alamprotsess sai vea" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle sai vea" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "ei õnnestu taastada fd %d: dup2 sai vea" @@ -295,51 +270,51 @@ msgstr "%s alamprotsess sai fataalse signaali %d" msgid "memory exhausted" msgstr "mälu on otsas" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: bind aadressi %s ei õnnestu lahendada; blokeerin bindi.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Loon ühendust serveriga %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Loon ühendust serveriga %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Loon ühendust serveriga [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF ebaõnnestus: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "ühendus loodud.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "ebaõnnestus: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: hosti aadressi %s ei õnnestu lahendada\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR ebaõnnestus: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "Liiga palju avatud faile. select ei saa kasutada kui fd >= %d\n" @@ -373,174 +348,174 @@ msgstr "Ei õnnestu kustutada %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ei suuda luua %s varukoopiat %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "%s küpsist ei õnnestu saada\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Set-Cookie süntaksi viga: %s kohal %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Präänik serverist %s üritas seada doomeniks " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Präänikute faili %s ei saa avada: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Ei saa kirjutada faili %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Viga %s sulgemisel: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Mittetoetatud listingu tüüp, proovin Unix listingu parserit.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s indeks serveris %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "tundmatu aeg " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fail " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Kataloog " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Viide " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Pole kindel " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s baiti)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Pikkus: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) veel" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s veel" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (autoriseerimata)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL seadistamine ei õnnestunud, SSL on blokeeritud." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Meldin serverisse kasutajana %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Vigane serveri vastus, sulgen juhtühenduse.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Vigane serveri tervitus.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Kirjutamine ebaõnnestus, sulgen juhtühenduse.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Server ei luba meldida.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Vigane meldimine.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Melditud!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Server ei aktsepteeri 'PBSZ 0' käsku.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Server ei aktsepteeri 'PROT %c' käsku.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Viga serveris, ei suuda tuvastada süsteemi tüüpi.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "tehtud. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "tehtud.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tundmatu tüüp `%c', sulgen juhtühenduse.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "tehtud. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD pole vajalik.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Loogiliselt võimatu sektsioon getftp() funktsioonis" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -551,7 +526,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -560,37 +535,37 @@ msgstr "" "Kataloogi %s pole.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ei ole kohustuslik.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Fail on juba olemas, ei tõmba.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ei saa algatada PASV ülekannet.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ei suuda analüüsida PASV vastust.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "ei õnnestu luua ühendust serveriga %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind operatsiooni viga (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Vale PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -598,17 +573,17 @@ msgstr "" "\n" "REST ebaõnnestus, alustan algusest.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Fail %s on olemas.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Faili %s pole.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -617,7 +592,7 @@ msgstr "" "Faili %s pole.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -626,40 +601,40 @@ msgstr "" "Faili või kataloogi %s pole.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ilmus.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, sulgen juhtühenduse.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - andme ühendus: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Juhtühendus suletud.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Andmete ülekanne katkestatud.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Fail %s on juba olemas, ei tõmba.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(katse:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -668,7 +643,7 @@ msgstr "" "%s (%s) - kirjutatud standardväljundissse %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -677,33 +652,33 @@ msgstr "" "%s (%s) - %s salvestatud [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Kustutan %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Kasutan %s ajutise listingu failina.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Kustutatud %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Rekursiooni sügavus %d ületab maksimum sügavust %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Kauge fail ei ole uuem, kui lokaalne fail %s -- ei lae.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -712,7 +687,7 @@ msgstr "" "Kauge fail on uuem kui lokaalne fail %s -- laen uuesti.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -721,11 +696,11 @@ msgstr "" "Suurused ei klapi (lokaalne %s) -- laen uuesti.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Vigane nimeviide, jätan vahele.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -734,238 +709,238 @@ msgstr "" "Korrektne nimeviide on juba olemas %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Loon nimeviite %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Ei toeta nimeviiteid, jätan nimeviite %s vahele.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Jätan kataloogi %s vahele.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tundmatu faili tüüp.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "%s õiguseid ei õnnestu seada.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: vigane ajatempel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Ei tõmba katalooge, kuna sügavus on %d (maks. %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Jätame %s vahele, ta on välistatud või pole kaasatud.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Keelame %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Viga %s otsimisel %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Jokker %s ei anna midagi.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Kirjutasin HTML-iseeritud indeksi faili %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Kirjutasin HTML-iseeritud indeksi faili %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "VIGA: Kataloogi %s ei saa avada.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "VIGA: Ei õnnestu avada sertifikaati %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Laetud CA sertifikaat '%s'\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "VIGA: Ei õnnestu laadida CRL faili '%s': (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Laetud CRL fail '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "VIGA: GnuTLS nõuab et võti ja sertifikaat oleks sama tüüpi.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: realiseerimata 'secure-protocol' parameetri väärtus %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Palun saatke see viga aadressile bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: realiseerimata 'secure-protocol' parameetri väärtus %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "VIGA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "HOIATUS" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ei esitanud sertifikaati.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Sertifikaat %s ei ole usaldatav.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: %s sertifikaat ei oma tuntud väljastajat.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikaat %s on kuulutatud kehtetuks.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Sertifikaadi %s allkirjastaja ei ole CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: %s sertifikaat on allkirjastatud ebaturvalise algoritmiga.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s sertifikaat ei ole veel aktiivne.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s sertifikaat on aegunud.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Viga X509 sertifikaadi initsialiseerimisel: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Sertifikaati pole.\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Viga sertifikaadi parsimisel: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Sertifikaat pole veel kehtiv\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Sertifikaat on aegunud\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Sertifikaadi omanik ja hosti nimi %s on erinevad\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Avalik võti pole sama kui kinnitatud avalik võti!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Sertifikaat peab olema X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Viga aadresside loendi käsitlemisel.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Tundmatu host" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Lahendan %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "ebaõnnestus: Masinal pole IPv4/IPv6 aadresse.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "ebaõnnestus: aegus.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ei õnnestu lahendada poolikut viidet %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Vigane URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP päringu kirjutamine ebaõnnestus: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Päiseid pole, eeldan HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -974,11 +949,11 @@ msgstr "" "Fail %s on juba olemas, ei tõmba.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime ebaõnnestus. See on tõenäoliselt viga.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -986,55 +961,55 @@ msgstr "" "Ajatemplit ei õnnestu http vormingusse teisendada. Kasutan viimase muutmise " "ajana 0.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY andmete failis %s puudub: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Kasutan ühendust serveriga [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Kasutan ühendust serveriga %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Proksi vastuse lugemine ebaõnnestus: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIGA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Katkine staatuse rida" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proksi tunneldamine ebaõnnestus: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Tundmatu autentimis skeem.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Valitud autentimine: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Salvestan: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1043,61 +1018,61 @@ msgstr "" "Laadides allkirja:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Allkirja ei õnnestu ajutisest failist lugeda. Jätan vahele.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ajutise faili loomine ebaõnnestus. Ei lae allkirja.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Vigane pri väärtus. Eeldan %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "Ei leia sobivat Metalink ressursside räsi. Ignoreerin neid.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Kuna tekkis vigu, siis blokeerin SSLi.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s päring saadetud, ootan vastust... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Andmeid ei saanudki.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Päiste lugemise viga (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(kirjeldus puudub)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Asukoht: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "määramata" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [järgnev]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1106,7 +1081,7 @@ msgstr "" "Fail %s ei ole serveril muutunud. Ei lae.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1117,7 +1092,7 @@ msgstr "" "Võib olla mõistlik kasutada võtit --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1127,83 +1102,83 @@ msgstr "" " Fail on juba täielikult kohal; rohkem ei saa midagi teha.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Pikkus: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignoreerin" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Hoiatus: HTTP ei toeta jokkereid.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Ämbliku režiim on sisse lülitatud. Kontrollige et mittelokaalne fail on " "olemas.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ei saa kirjutada faili %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Laekunud päises puudub nõutud atribuut.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Kasutajanimi/Parool autentimine ebaõnnestus.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ei saa kirjutada WARC faili.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ei saa kirjutada ajutisse WARC faili.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "SSL ühenduse loomine ei õnnestu.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ei saa kustutada %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIGA: Ãœmbersuunamine (%d) ilma asukohata.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Ei leia HTTP vastuses Metalink andmeid. Laen faili kasutades HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Leidsin metalink päised. Lülitan metalink moodi.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Mittelokaalset faili pole -- katkine viide!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified päist pole -- ei kasuta ajatempleid.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified päis on vigane -- ignoreerin ajatemplit.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1212,16 +1187,16 @@ msgstr "" "Fail serveril ei ole uuem lokaalsest failist %s -- ei lae.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Suurused ei klapi (lokaalne %s) -- laen uuesti.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Kauge fail on uuem, laen alla.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1231,13 +1206,13 @@ msgstr "" "laen.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Kauge fail on olemas, aga ei sisalda viiteid -- ei lae.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1247,7 +1222,7 @@ msgstr "" "aga rekursioon pole lubatud -- ei lae.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1255,12 +1230,12 @@ msgstr "" "Kauge fail on olemas.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1269,7 +1244,7 @@ msgstr "" "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1278,58 +1253,58 @@ msgstr "" "%s (%s) - %s salvestatud [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ãœhendus suletud baidil %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lugemise viga baidil %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lugemise viga baidil %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Mittetoetatud kaitse kvaliteet '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Mittetoetatud algoritm '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC viitab %s, mida pole olemas.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s ei saa lugeda (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Viga %s's real %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Süntaksi viga %s's real %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Tundmatu käsklus %s, failis %s real %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1339,7 +1314,7 @@ msgstr "" "Süsteemse wgetrc faili (env SYSTEM_WGETRC) parsimine ebaõnnestus. Palun\n" "kontrollige '%s', või määrake võtmega --config teine fail.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1349,47 +1324,47 @@ msgstr "" "Süsteemse wgetrc faili parsimine ebaõnnestus. Palun\\n\"\n" "\"kontrollige '%s', või määrake võtmega --config teine fail.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Hoiatus: Nii süsteemne kui kasutaja wgetrc viitab %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Vigane --execute käsklus %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Vigane tõeväärtus %s; kasutage `on' või `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Vigane %s; kasutage `on', `off' või `quiet'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s %s: Vigane number %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s tohib kasutada ainult korra\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Vigane baidi väärtus %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Vigane aja periood %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1397,28 +1372,28 @@ msgid "" msgstr "" "use-askpass nõuab sõne või keskkonnamuutujat WGET_ASKPASS või SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Vigane väärtus %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Vigane päis %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Vigane WARC päis %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Vigane edenemise tüüp %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1427,40 +1402,40 @@ msgstr "" "%s: %s: Vigane piirang %s,\n" " kasutage [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodeering %s ei ole lubatud\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Teisendamist %s -> %s ei toetata\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Leiti mittetäielik või vigane mitmebaidi järjestus\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Käsitlemata errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: lokaat ei ole määratud\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode ebaõnnestus (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Väiketähtedeks teisendamine ebaõnnestus: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1469,17 +1444,17 @@ msgstr "" "\n" "Suunan väljundi faili %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; blokeerin logimise.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Kasuta: %s [VÕTI]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1488,64 +1463,64 @@ msgstr "" "lühikestele.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Start:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version näita Wget versioon ja lõpeta töö\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help näita abiinfot\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background tööta taustal\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=KÄSKLUS täida `.wgetrc'-stiilis käsklus\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Logimine ja sisendfail:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FAIL logi teated faili FAIL\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FAIL lisa teated faili FAIL\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug väljasta silumise teated\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug väljasta Watt-32 silumise teated\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tööta vaikselt\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose lobise (see on vaikimisi)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --non-verbose keela lobisemine, luba asjalikud teated\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1553,14 +1528,14 @@ msgstr "" " --report-speed=TÜÜP läbilaske väljundi tüüp. TÜÜP võib olla " "bitid\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" " -i, --input-file=FAIL loe URLid [mitte]lokaalsest failist FAIL\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1568,11 +1543,11 @@ msgstr "" " --input-metalink=FAIL lae lokaalses Metalink failis näidatud " "failid\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html käsitle sisendfaili HTMLina\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1581,41 +1556,41 @@ msgstr "" "faili\n" " viited (-i -F)\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=FAIL määra seadistuste fail\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config ära kasuta seadete faile\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " --rejected-log=FAIL URLide blokeerimise teadete logi\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Allalaadimine:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=NUMBER katsete arvuks NUMBER (0 piiramata)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused korda isegi kui ühendusest keeldutakse\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=FAIL kirjuta dokumendid faili FAIL\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1624,38 +1599,38 @@ msgstr "" "olemasolevad\n" " failid üle\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config ära kasuta seadete faile\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue jätka olemasoleva faili allalaadimist\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" " --start-pos=INDEKS alsuta alla laadimist antud indeksilt\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TÜÜP vali progressi indikaatori tüüp\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TÜÜP vali progressi indikaatori tüüp\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1663,7 +1638,7 @@ msgid "" msgstr "" " -N, --timestamping ära tõmba vanemaid faile kui lokaalsed\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1672,7 +1647,7 @@ msgstr "" " --no-if-modified-since ära kasuta tingimust if-modified-since,\n" " kasuta päringutel ajatembeldamist\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1680,54 +1655,54 @@ msgstr "" " --no-use-server-timestamps ära sea lokaalsele failile serveris\n" " oleva faili aega\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response trüki serveri vastused\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ara tõmba midagi\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEK kõik taimoutid on SEKUNDEID\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr " --dns-servers=AADRESSID komadega eraldatud DNS serverid\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr " --bind-dns-address=AADRESS kasuta kohaliku masina nime või IP\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SEK nime lahenduse aegumine on SEK\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SEK ühenduse loomise aegumine on SEK\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEK lugemise aegumine on SEK\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDEID oota SEKUNDEID päringute vahel\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" " --waitretry=SEKUNDEID oota 1..SEKUNDIT laadimise katsete vahel\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1735,30 +1710,30 @@ msgstr "" " --random-wait oota korduste vahel " "0.5*SEKUNDIT..1.5*SEKUNDIT\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy proksit ei kasuta\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMBER kasuta kvooti NUMBER\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" " --bind-address=AADRESS kasuta kohaliku masina nime või IP\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=KIIRUS piira allalaadimise kiirust\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache blokeeri nimeserveri puhver\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1766,7 +1741,7 @@ msgstr "" " --restrict-file-names=OS luba failinimedes ainult OS poolt lubatud " "sümboleid\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1774,15 +1749,15 @@ msgstr "" " --ignore-case failide/kataloogide otsimine on " "tõstutundetu\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only kasuta ainult IPv4 aadresse\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only kasuta ainult IPv6 aadresse\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1791,20 +1766,20 @@ msgstr "" " --prefer-family=PEREK loo ühendus esmalt antud aadressiga,\n" " väärtus on IPv6, IPv4 või none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=USER sea nii ftp, kui http kasutaja\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=PASS sea nii ftp, kui http parool\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password küsi paroole\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1821,26 +1796,26 @@ msgstr "" " WGET_ASKPASS või SSH_ASKPASS keskkonna\n" " muutujat.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri lülita IRI tugi välja\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr " --local-encoding=KOOD määra kohalik kodeering IRI jaoks\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KOOD määra mittelokaalne kodeering IRI jaoks\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink eemalda fail\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1848,7 +1823,7 @@ msgstr "" " --keep-badhash säilita kontrollsumma vigadega failid " "(lisa .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1856,7 +1831,7 @@ msgstr "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl järjekorra NUMBER\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1864,14 +1839,14 @@ msgstr "" " --metalink-over-http kasuta HTTP päistest Metalink " "metaandmeid\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location Metalink ressursside eelistatud asukoht\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1879,57 +1854,57 @@ msgstr "" " --no-xattr ära kasuta laiendatud atribuute metainfo " "jaks\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Kataloogid:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories ära loo katalooge\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories kohustuslik kataloogide tekitamine\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ära loo hosti kataloogi\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories kasuta kataloogides protokolli nime\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=PREFIX salvesta failid kataloogi PREFIX/...\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=NUMBER ignoreeri NUMBER kataloogi komponente\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP võtmed:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER kasuta http kasutajat USER\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS kasuta http parooli PASS\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache keela puhverdamise kasutamine\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1937,7 +1912,7 @@ msgstr "" " --default-page=NIMI muuda vaikimisi lehe nime (tavaliselt\n" " on selleks `index.html'.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1945,38 +1920,38 @@ msgstr "" " -E, --adjust-extension salvesta HTML/CSS dokumendid korrektse " "lõpuga\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length inoreeri `Content-Length' päise välja\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=SÕNE lisa SÕNE päisesse\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TÜÜP vali progressi indikaatori tüüp\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimaalne ümbersuunamiste arv lehel\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=USER USER proxy kasutajanimeks\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=PASS PASS proxy parooliks\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -1984,11 +1959,11 @@ msgstr "" " --referer=URL lisa HTTP päringu päisesse `Referer: " "URL'\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers salvesta HTTP päised\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -1996,7 +1971,7 @@ msgstr "" " -U, --user-agent=AGENT identifitseeri kui AGENT, mitte kui\n" " Wget/VERSIOON\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2004,23 +1979,23 @@ msgstr "" " --no-http-keep-alive blokeeri HTTP keep-alive (püsivad " "ühendused)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ära kasuta präänikuid\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FAIL lae enne sessiooni präänikud failist " "FAIL\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FAIL salvesta sessiooni lõpus präänikud\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2028,32 +2003,32 @@ msgstr "" " --keep-session-cookies lae ja salvesta sessiooni (ühekordsed)\n" " präänikud\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr " --post-data=SÕNE kasuta POST meetodit; saada SÕNE\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=FAIL kasuta POST meetodit; saada FAILi sisu\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=HTTPMeetod kasuta päises \"HTTPMeetod\"\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" " --body-data=SÕNE saada sõne. --method PEAB olema seatud\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2061,7 +2036,7 @@ msgstr "" " --body-file=FAIL saada faili sisu. --method PEAB olema " "seatud\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2071,14 +2046,14 @@ msgstr "" " --content-disposition luba Content-Disposition päist lokaalse\n" " faili nime valikul (EKSPERIMENTAALNE)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error väljasta laetud sisu serveri vigadena\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2089,11 +2064,11 @@ msgstr "" "et\n" " ootaks serverilt päringut\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) võtmed:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2104,49 +2079,49 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 ja PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only järgi ainult turvalisi HTTPS viiteid\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ära valideeri serveri sertifikaati\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FAIL kliendi sertifikaat\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate-type=TÜÜP kliendi sert. tüüp, PEM või DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --privare-key=FAIL privaatvõti\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TÜÜP privaatvõtme tüüp, PEM või DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FAIL CA nimekirja fail\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=KAT CA nimekirja kataloog\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FAIL CRL fail\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2160,39 +2135,39 @@ msgstr "" " 'sha256//' ja eraldajaga ';', millega\n" " konrtollida partnerit\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=FAIL fail juhuarvudega SSL PRNG laadimiseks\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=FAIL EGD pistiku faili nimi\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS võtmed:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts keela HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" " --hsts-file HSTS andmebaas (vaikeväärtuse asemel)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP võtmed:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2200,34 +2175,34 @@ msgstr "" " --ftp-stmlf kasuta binaar moodis FTP failide jaoks\n" " Stream_LF vormingut\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER sea ftp kasutaja\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS sea ftp parool\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ära eemalda `.listing' faile\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob lülita faili nime täiendamine välja\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp ei kasuta \"passive\" ülekande moodi\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions säilita kauge faili õigused\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2235,18 +2210,18 @@ msgstr "" " --retr-symlinks lae ka failide nimeviited\n" " (mitte kataloogidele)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS võtmed:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" " --ftps-implicit kasuta FTPS protokolli (port 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2256,7 +2231,7 @@ msgstr "" "ühendusel\n" " loodud SSL/TLS sessiooni\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2264,18 +2239,18 @@ msgstr "" " --ftps-clear-data-connection Å¡ifreeri ainult kontroll kanal; " "andmed on avatekstis\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" " --ftps-fallback-to-ftp kui FTPS pole toetatud, kasuta FTP\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC võtmed:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2283,21 +2258,21 @@ msgstr "" " --warc-file=FAILINIMI salvesta päring/vastus info .warc.gz " "faili\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=SÕNE lisa SÕNE warcinfo kirjesse\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " --warc-max-size=NUMBER sea maksimaalne WARC faili suurus\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx kirjuta CDX indeks failid\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2305,23 +2280,23 @@ msgstr "" " --warc-dedup=FAILINIMI ära salvesta selles CDX failis olevaid\n" " kirjeid\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ära tihenda WARC faile GZIP programmiga\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ära arvuta SHA1 räsi\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr " --no-warc-keep-log ära säilita WARC kirje logi\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2329,15 +2304,15 @@ msgid "" msgstr "" " --warc-tempdir=KATALOOG WARC kirjutaja ajutiste failide asukoht\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursiivne allalaadimine:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekursiivne allalaadimine\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2345,13 +2320,13 @@ msgstr "" " -l, --level=NUMBER maksimaalne rekursiooni sügavus\n" " (inf või 0 lõpmatu)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after kustuta allalaetud failid\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2361,7 +2336,7 @@ msgstr "" "viited\n" " viitama lokaalsetele failidele\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2369,7 +2344,7 @@ msgstr "" " --convert-file-only teisenda ainult faili osa URL'is (tuntud " "kui baasnimi)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2377,7 +2352,7 @@ msgstr "" " --backups=N enne faili X kirjutamist, roteeri kuni\n" " N varukoopiat\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2385,7 +2360,7 @@ msgstr "" " -K, --backup-converted enne faili X teisendamist salvesta\n" " failiks X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2393,7 +2368,7 @@ msgstr "" " -K, --backup-converted enne faili X teisendamist salvesta\n" " failiks X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2401,7 +2376,7 @@ msgstr "" " -m, --mirror lühend võtmetele\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2409,7 +2384,7 @@ msgstr "" " -p, --page-requisites lae kõik HTML lehe vaatamiseks vajalik " "info\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2417,61 +2392,61 @@ msgstr "" " --strict-comments lülita sisse range (SGML) HTML\n" " kommentaaride käsitlemine\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekursiivne accept/reject:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LIST lubatud laienduste nimistu\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LIST keelatud laienduste nimistu\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGAV aktsepteeritavate URLide regulaaravaldis\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGAV keelatud URLide regulaaravaldis\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TÜÜP regulaaravaldise tüüp (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TÜÜP regulaaravaldise tüüp (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST komadega eraldatud lubatud doomenite " "loend\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST komadega eraldatud keelatud doomenite " "loend\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp järgne HTML dokumentides FTP viidetele\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2479,7 +2454,7 @@ msgstr "" " --follow-tags=LIST komadega eraldatud loend järgitavaid\n" " HTML lipikuid\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2487,19 +2462,19 @@ msgstr "" " --ignore-tags=LIST komadega eraldatud loend ignoreeritavaid\n" " HTML lipikuid\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts mine ka teistesse serveritesse\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative järgne ainult suhtelisi viiteid\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIST lubatud kataloogide nimistu\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2507,81 +2482,81 @@ msgid "" msgstr "" " --trust-server-names kasuta ümbersuunamisel määratud nime\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST välistatud kataloogide nimistu\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ära tõuse vanem kataloogini\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Saatke soovitused ja vigade kirjeldused aadressil \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, mitte-interaktiivne võrgust laadija.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Parool kasutajale %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Parool: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Toru ei õnnestu luua\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Viga use-askpass tegevuste faili initsialiseerimisel: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Viga use-askpass tegevuste faili seadmisel: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Viga käsu vastuse lugemisel \"%s %s\": %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Kasutajanimi '%s%s': " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Parool kasutajale '%s%s@%s': " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokaat: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompileeritud:" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Lingitud:" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2590,29 +2565,29 @@ msgstr "" "GNU Wget %s ehitatud süsteemil %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (keskkond)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (kasutaja)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (süsteem)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Autoriõigus © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2626,7 +2601,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2634,37 +2609,37 @@ msgstr "" "\n" "Selle programmi kirjutas Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Palun saatke vigade kirjeldused ja küsimused aadressil .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Mälu ei jätku\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Lõpetan %s vea tõttu\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Täiendava info saamiseks proovige `%s --help'.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegaalne võti -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Silumise tugi pole kompileeritud. Ignoreerin --debug võtit.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2673,7 +2648,7 @@ msgstr "" "Kasutati korraga --no-clobber ja --convert-links, kasutan ainult --convert-" "links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2682,22 +2657,22 @@ msgstr "" "Kasutati korraga --no-clobber ja --convert-file-only, kasutan ainult --" "convert-file-only.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ei saa korraga lobiseda ja vait olla.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Ei saa samaaegselt muuta failide aegu ja mitte puutuda vanu faile.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ei saa korraga kasutada --inet4-only ja --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2710,7 +2685,7 @@ msgstr "" "manualist.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2720,7 +2695,7 @@ msgstr "" "salvestatakse teie poolt määratud ühte faili.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2730,30 +2705,25 @@ msgstr "" "manualist.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Fail `%s' on juba olemas, ei tõmba.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "WARC väljund ei tööta võtmega --no-clobber, --no-clobber blokeeritakse.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "WARC väljund ei tööta ajatemplitega, ajatembeldamine blokeeritakse.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC väljund ei tööta võtmega --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2762,14 +2732,14 @@ msgstr "" "WARC väljund ei tööta võtmetega --continue, --start-pos, need " "blokeeritakse.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Räsi on blokeeritud; WARC deduplitseerimine ei leia duplikaat kirjeid.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2778,12 +2748,12 @@ msgstr "" "WARC väljund ei tööta võtmetega --continue, --start-pos, need " "blokeeritakse.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Võtmeid --ask-password ja --password ei saa korraga kasutada.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2792,17 +2762,17 @@ msgstr "" "Korraga --start-pos ja --continue kasutamine pole soovitatav; --continue " "blokeeritakse.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: puudub URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Võtmeid --post-data ja --post-file ei saa korraga kasutada.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2811,7 +2781,7 @@ msgstr "" "Võtmeid --post-data või --post-file ei saa kasutada koos võtmega --method. --" "method eeldab andmeid võtmetega --body-data ja --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2820,17 +2790,17 @@ msgstr "" "--body-data või --body-file korral tuleb määrata meetod võtmega --" "method=HTTPMeetod.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Võtmeid --body-data ja --body-file ei saa korraga kasutada.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "See versioon ei toeta IRIsid\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2839,7 +2809,7 @@ msgstr "" "suunatud\n" "tavalisse faili.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2848,42 +2818,42 @@ msgstr "" "--convert-links või --convert-file-only saab koos kasutada ainult juhul, kui " "väljund on suunatud tavalisse faili.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "libcares initsialiseerimine ebaõnnestus\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ei õnnestu seadistada c-ares kanalit\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP aadressi '%s' ei õnnestu parsida\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ei õnnestu seada DNS serverit '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "%s ei sisalda URLe.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Metalink faili %s parsimine ei õnnestu.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Kõiki ressursse ei õnnestunud %s pealt laadida.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2894,7 +2864,7 @@ msgstr "" "Täielik aeg: %s\n" "Alla laetud: %d faili, %s aeg %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Allalaadimise kvoot %s ON ÃœLETATUD!\n" @@ -3050,104 +3020,104 @@ msgstr "Fail %s on laetud, aga allkiri ei klapi.\n" msgid "Renaming %s to %s.\n" msgstr "%s uus nimi on %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Jätkan taustas.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Jätkan taustal, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Väljund kirjutatakse faili %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() sai vea\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() sai vea\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ei leia kasutuskõlblikku pistiku programmi.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() sai vea. Pistikut ei õnnestunud seada blokeerivaks.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: hoiatus: %s lekseem on enne masina nime\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: tundmatu lekseem \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Kasuta: %s NETRC [HOSTINIMI]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat operatsioon ebaõnnestus %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "HOIATUS: vilets juhuarvude alginfo.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ei õnnestu laadida PRNGd; kasutage --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Teie OpenSSL versioon on TLSv1.1 jaoks liiga vana\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Teie OpenSSL versioon on TLSv1.2 jaoks liiga vana\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: realiseerimata 'secure-protocol' parameetri väärtus %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: %s sertifikaati ei õnnestu kontrollida, väljastaja %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Väljastaja autoriteeti ei saa kontrollida.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Leiti ise-allkirjastatud sertifikaat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Välja antud sertifikaat pole veel kehtiv.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Välja antud sertifikaat on aegunud.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3156,14 +3126,14 @@ msgstr "" "%s: sertifikaadi subjekti alternatiivne nimi ei klapi\n" "\tküsitud hosti nimega %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: sertifikaadi üldine nimi %s ei klapi küsitud hosti nimega %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3174,14 +3144,14 @@ msgstr "" " See võib viidata et server pole see, millena ta üritab ennast näidata\n" " (see tähendab,see pole reaalne %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Kontrollimata ühenduse loomiseks servieriga %s kasutage `--no-check-" "certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3190,28 +3160,28 @@ msgstr "" "\n" "%*s[ hüppan üle %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Vigane punkt stiili spetsifikatsioon %s; jätan muutmata.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " aeg " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ei õnnestu lugeda REAALAJA kella sagedust: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Kustutan %s, kuna see peaks olema tagasi lükatud.\n" @@ -3225,28 +3195,28 @@ msgstr "Ei saa avada %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laen robots.txti faili; palun ignoreerige võimalikk vigu.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Viga proxy urli parsimisel %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Viga proxy urlis %s: Peab olema HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d ümbersuunamist ületatud.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" msgstr "Annan alla.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3254,125 +3224,125 @@ msgstr "" "Proovin uuesti.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Vigu pole" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Mittetoetatud skeem %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Skeem puudub" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Vigane serveri nimi" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Vigane pordi number" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Vigane kasutaja nimi" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Lõpetamata numbriline IPv6 aadress" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 aadresse ei toetata" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Vigane numbriline IPv6 aadress" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS tuge pole sisse kompileeritud" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Leiti mittetäielik või vigane mitmebaidi järjestus\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Mälu küsimine ebaõnnestus; mälu on otsas.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: %ld baidi küsimine ebaõnnestus; mälu on otsas.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: teksti puhver on liiga suur (%d baiti), katkestan.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Jätkan taustal, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ei õnnestu kustutada nimeviidet %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "libcares initsialiseerimine ebaõnnestus\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s õiguseid ei õnnestu seada.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "%s õiguseid ei õnnestu seada.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "IP aadressi '%s' ei õnnestu parsida\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "%s õiguseid ei õnnestu seada.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Vigane regulaaravaldis %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Viga %s leidmisel: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3457,6 +3427,24 @@ msgstr "" "Leidsin täpse vaste CDX failist. Salvestan uuesti külastamise kirje WARC " "faili.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: võti '--%s' ei luba argumenti\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: tundmatu võti '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: võti '-W %s' on segane\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: võti '-W %s' ei luba argumenti\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: võti '-W %s' nquab argumenti\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Fail `%s' on juba olemas, ei tõmba.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/eu.gmo b/po/eu.gmo index a034f00..487a814 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index df6d31a..6d157b2 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.14.128\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2013-06-14 00:35+0100\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Poedit 1.5.5\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Errore ezezaguna" @@ -32,7 +32,7 @@ msgstr "Errore ezezaguna" msgid "Address family for hostname not supported" msgstr "IPV6 motako helbideak ez daude erabilgarri" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -102,70 +102,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Errore ezezaguna" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: `%s' aukera anbiguoa da\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: `-W %s' aukera anbiguoa da\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: `-W %s' aukera anbiguoa da\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: `%s' aukera anbiguoa da\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: `--%s'k ez du argudiorik onartzen\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: aukera ezezaguna `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: `%c%s' aukerak ez du argudiorik onartzen\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: `%s' aukerak argudio bat behar du\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: aukera·ezezaguna `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: aukera ezezaguna `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: legez kanpoko aukera -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: aukerak argumentu bat behar du -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: `-W %s' aukera anbiguoa da\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: `%s' aukerak argudio bat behar du\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -185,13 +160,13 @@ msgstr "%s: `%s' aukerak argudio bat behar du\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -266,28 +241,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -306,51 +281,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Konektatzen: %s|%s|:%d..." -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Konektatzen %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Konektatzen [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "konektatua.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "huts egin da: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -384,176 +359,176 @@ msgstr "Ezin da `%s' ezabatu: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ezin da %s gordetzeko kopia egin %s bezala: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Ezin da `%s' ezabatu: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Kookie-a ezartzean sintaxi errorea: %s %d posizioan.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ezin da `%s' cookie fitxategia ireki: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Errorea `%s' idazterakoan: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "`%s' itxitzerakoan errorea: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Zerredatze mota sostengurik gabe, Unix zerrendatze sintaxi-" "analizatzailearekin saiatzen.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s-ren indexa %s:%d-en" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "denbora ezezaguna " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fitxategia " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Direktorioa " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Zihurtasunik gabe " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Luzeera: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (autorizaziorik gabea)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "%s bezala saioa hasten... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Zerbitzariaren erantzunean errorea, konexio kontrol panela itxitzen.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Errorea zerbitzarikin agurtzerakoan.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Idaztean huts egin da, kontrol konexioa itxitzen.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Zerbitzariak saio hasiera ukatzen du.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Saio sartze okerra.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Saiora sartua!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Zerbitzari errorea, ezin da sistema moeta determinatu.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "eginda. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "eginda.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Mota ezezaguna `%c', kontrol konexioa itxitzen.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "eginda. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWDa ez da behar.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -561,7 +536,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -570,38 +545,38 @@ msgstr "" "Ez dago `%s' direktoriorik.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ez da beharrezkoa.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ezin da PASV transferentzia hasi.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ezin da PASV erantzuan parseatu.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, fuzzy, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "ezin izan da %s-ra konektatu:%hu:%s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Lotze errorea (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORTU desegokia.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -609,19 +584,19 @@ msgstr "" "\n" "REST komanduak huts egin du, hutsetik hasten.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "Ez dago `%s' fitxategirik.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -630,7 +605,7 @@ msgstr "" "Ez dago `%s' fitxategirik.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -639,47 +614,47 @@ msgstr "" "Ez dago `%s' fitxategi edo direktoriorik.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, konexio kontrola itxitzen.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Datu konexioa: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Kontrol konexioa itxia.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Datu transferentzia abortatua.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(saiatu:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -688,41 +663,41 @@ msgstr "" "%s (%s) - %s gordeta [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "%s ezabatzen.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "`%s' erabiltzen zerrenda tmp fitxategi bezala.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s ezabatua.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Inkurtsio sakonera %dk maximoa gainditzen du. Sakonera %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "`%s' fitxategi erremotoa ez da bertakoa baina berriagoa -- ez da jasoko.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "`%s' fitxategi erremotoa bertakoa baina berriagoa da -- jasotzen.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -731,11 +706,11 @@ msgstr "" "Tamainuak ez dute ezkontzen (lokalak %ld) -- jasotzen.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Baliogabeko symlink izena, saltatzen.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -744,373 +719,373 @@ msgstr "" "Dagoeneko baduka link simboliko zuzena %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Link sinbolikoa sortzen %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Link sinbolikoak ez daude onartuak, `%s' link sinbolikoa baztetzen.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "Direktorioa utzitzen `%s'.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: ezagun/euskarririk gabeko fitxategi mota.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Huts egin da zertifikazio gakoa hartzerakoan %s-tik\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: ordu zigilu okerra.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Ez dira direktorio gehiago jasoko, sakonera %d-koa delako (mas %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ez jaisten `%s'ra, ez baitago sartua edo exkluditua dago.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "`%s' ez onartzen.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Errorea `%s' idazterakoan: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "`%s' ereduarekin ez du lotzen.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Idatzia HTMLizatutako index-a `%s'-en [%ld].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Idatzia HTMLzatutako index-a '%s'-en.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERROREA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ostalari ezezaguna" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "%s ebazten... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "huts·egin·da: denboraz kanpo.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ezin da osatu gabeko linka ebatzi %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Baliogabeko URLa %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Huts egin da HTTP eskaera idazterakoan: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Konexioa berrerabiltzen %srentzat: %hu.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Konexioa berrerabiltzen %srentzat: %hu.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Huts egin da HTTP eskaera idazterakoan: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROREA %d %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Gaizki eratutako egoera lerroa" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Autentifikazio eskema ezezaguna.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Autentifikazio eskema ezezaguna.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Hemen gordetzen: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s eskaera bidalia, erantzunaren zain... " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "Ez da daturik jaso" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Irakurketa errorea (%s) goiburukoetan.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(deskripziorik gabe)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Kokapena: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "zehaztugabea" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [hurrengoa]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1118,7 +1093,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1128,81 +1103,81 @@ msgstr "" " Fitxategi hau iada guztiz jasoa dago; ezer ez egiteko.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Luzera: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "baztertua" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Oharra: komodinak ez daude onartuak HTTPean.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ezinezkoa SSL konexioa sortzea.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROREA: (%d) helbideraketa kokapenik gabe.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Azken·burugoiko·modifikazitua falta da·-·ordu·zigilua·itzalia.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Azken burugoiko modifikazioa baliogabekoa - ordu zigilua ignoratua.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1212,16 +1187,16 @@ msgstr "" "da jasoko.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Tamainuak·ez·dute·ezkontzen·(lokalak·%ld)·--·jasotzen.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1229,7 +1204,7 @@ msgid "" "\n" msgstr "`%s' fitxategi erremotoa bertakoa baina berriagoa da -- jasotzen.\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1237,33 +1212,33 @@ msgid "" msgstr "" "`%s' fitxategi erremotoa ez da bertakoa baina berriagoa -- ez da jasoko.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Fitxategi erremotoa berriagoa da, jasotzen.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROREA %d %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1272,58 +1247,58 @@ msgstr "" "%s (%s) - `%s' gordeta [%ld/%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Konexioa itxia ondorengo bytean %ld. " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Irakurtze errorea %ld bytean (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Irakurtze errorea %ld/%ld bytean (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Sostengu gabeko eskema" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC %sra apuntatzen du, ez dena existitzen.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ezin irakurri %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: %s-n errorea %d lerroan.\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: %s-n errorea %d lerroan.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: %s-n errorea %d lerroan.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1331,7 +1306,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1339,115 +1314,115 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Kontuz: Bai sistema bai wgetrc `%s'ra apuntatzen dute.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Baliogaeko --exekutatu`%s' komandoa\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Baliogabeko booleanoa `%s', erabili `on' edo `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Baliogabeko booleanoa `%s', erabili `on' edo `off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Baliogabeko zenbakia `%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Baliogabeko byte balioa `%s'\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Baliogabeko denbora tartea `%s'\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Baliogabeko balioa `%s'.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Baliogabeko goiburukoa `%s'.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Baliogabeko goiburukoa `%s'.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Baliogabeko aurreratze mota `%s'.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "%s: %s: Baliogabeko mugaketa `%s', erabili `unix' edo `windows'.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "ezin izan da %s-ra konektatu:%hu:%s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1456,17 +1431,17 @@ msgstr "" "\n" "%s jasota, irteera `%s'ra bideratzen.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; saio hasiera desgaitzen.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Erabili: %s [AUKERA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1476,291 +1451,291 @@ msgstr "" "Aginduzko argumentu luzeegiak aukera txikientzako agindu ere badira.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1771,211 +1746,211 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Direktorioak:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1983,13 +1958,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1997,58 +1972,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2058,406 +2033,406 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, sare informazio jaitsitzaile ez interaktiboa.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Pasahitza:" -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "Ezin da `%s' idatzi (%s).\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale-a:" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Konpilazioa:" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Esteka:" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2467,7 +2442,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2475,67 +2450,67 @@ msgstr "" "\n" "Originalki Hrvoje Niksic-k idatzia .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Bidali bug-ak eta iradokizunak -era.\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Saiatu `%s --help` aukera gehiagorako.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: legez kanpoko aukera -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ezin da berritsu eta ixil moduan egon une berean.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ezin dira ez-gainidatzi fitxategiak eta denbora markak erabili une berean.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2543,157 +2518,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL falta\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Huts egin da `%s' link sinbolikoa askatzerakoan: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Ez da URLrik aurkitu %s-n.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ezin da `%s' ezabatu: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2704,7 +2674,7 @@ msgstr "" "AMAITUTA --%s--\n" "Jatsitakoa: %s byte %d fitxategietan\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Jaitsiera kuota (%s byte) GAINDITUA!\n" @@ -2862,118 +2832,118 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "%s ezabatzen.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Atzeko planoan jarraitzen.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Atzeko planoan jarraitzen, pid %d.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Irteera `%s'-n idatziko da.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ezin aurkitu socket kontrolatzaile erabilgarririk.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: abisua: \"%s\" tokena makina izenanen aurretik dago\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token ezezaguna \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Erabilera: %s NETRC [HOST-IZENA]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ezin da identifikatu %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ezin da OpenSSL PRNG hasi, SSL ezintzen.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2981,12 +2951,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -2995,7 +2965,7 @@ msgstr "" "\n" "%*s[ saltatzen %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3003,21 +2973,21 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "%s ezabatzen ezestua izan behar zuelako.\n" @@ -3031,22 +3001,22 @@ msgstr "Ezin dira %s-ko linkak bihurtu: %s\n" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Robots.txt kargatzen; mesedez ignoratu erroreak.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Proxy URLa parseatzen errorea %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Errorea proxy URLan %s: HTTP izan behar du.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d erredirekzio kopurua gainditua.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3054,7 +3024,7 @@ msgstr "" "Utzitzen.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3062,126 +3032,126 @@ msgstr "" "Berriz saiatzen.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Errorerik ez" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "Sostengu gabeko eskema" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 #, fuzzy msgid "Invalid host name" msgstr "Baliogabeko erabiltzaile izena" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Portu zenbaki akastuna" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Baliogabeko erabiltzaile izena" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "IPv6 zenbaki helbide amaitugabea" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPV6 motako helbideak ez daude erabilgarri" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Baliogabeko IPv6 zenbaki helbidea" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr "%s: ez dago debug euskarriarekin konpilatua.\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Atzeko planoan jarraitzen, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Huts egin da `%s' link sinbolikoa askatzerakoan: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Huts egin da `%s' link sinbolikoa askatzerakoan: %s\n" +msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Huts egin da zertifikazio gakoa hartzerakoan %s-tik\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Huts egin da zertifikazio gakoa hartzerakoan %s-tik\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Huts egin da zertifikazio gakoa hartzerakoan %s-tik\n" +msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Huts egin da zertifikazio gakoa hartzerakoan %s-tik\n" +msgstr "%s-tik zertifikazioak kargatzerakoan huts egin da\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Errorea `%s' idazterakoan: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3259,8 +3229,23 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" #, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: Baliogabeko URLa %s: %s\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: `--%s'k ez du argudiorik onartzen\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: aukera·ezezaguna `--%s'\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: `%s' aukerak argudio bat behar du\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Autorizazitzen huts egin da.\n" #, fuzzy #~ msgid "" @@ -3268,8 +3253,9 @@ msgstr "" #~ "%s received.\n" #~ msgstr "Ez da daturik jaso" -#~ msgid "Authorization failed.\n" -#~ msgstr "Autorizazitzen huts egin da.\n" +#, fuzzy +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "`%s' fitxategia dagoeneko badago, ez da jasoko.\n" #, fuzzy #~ msgid "%s can not be used with --metalink.\n" diff --git a/po/fi.gmo b/po/fi.gmo index e900dc4..9414a3f 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 6b70170..0dd8574 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2015-04-16 20:27+0200\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.7.5\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" @@ -29,7 +29,7 @@ msgstr "Tuntematon järjestelmävirhe" msgid "Address family for hostname not supported" msgstr "Osoiteperhettä ei tueta verkkoasemalle" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Väliaikainen virhe nimipalvelussa" @@ -97,70 +97,45 @@ msgstr "Signaalin keskeyttämä" msgid "Parameter string not correctly encoded" msgstr "Parametrimerkkijono ei ole koodattu oikein" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Tuntematon virhe" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valitsin ’%s’ on moniselitteinen; mahdollisuudet:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: valitsin ’%s’ on moniselitteinen; mahdollisuudet:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: tunnistamaton valitsin ’%c%s’\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valitsin ’--%s’ vaatii argumentin\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: tunnistamaton valitsin ’--%s’\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: tunnistamaton valitsin ’%c%s’\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: valitsin on virheellinen – ’%c’\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin vaatii argumentin – ’%c’\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: valitsin ’-W %s’ on moniselitteinen\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -180,13 +155,13 @@ msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "â€" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -259,28 +234,28 @@ msgstr "Säännöllinen lauseke on liian suuri" msgid "Unmatched ) or \\)" msgstr "Pariton ) tai \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Virheellinen edeltävä säännöllinen lauseke" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "putken luominen epäonnistui" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s-aliprosessi epäonnistui" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle epäonnistui" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "fd-palautus epäonnistui %d: dup2 epäonnistui" @@ -299,51 +274,51 @@ msgstr "%s-aliprosessi vastaanotti kohtalokkaan signaalin %d" msgid "memory exhausted" msgstr "muisti loppui" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: lähdeosoite %s ei selvinnyt, osoitetta ei käytetä.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Yhdistetään palvelimeen %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Yhdistetään palvelimeen %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Yhdistetään palvelimeen [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "yhdistetty.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "epäonnistui: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: verkkoasemaosoitteen %s ratkaiseminen epäonnistui\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -377,174 +352,174 @@ msgstr "Tiedoston %s poistaminen epäonnistui: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Tiedoston %s varmuuskopiointi tiedostoon %s epäonnistui: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaksivirhe Set-Cookiessa: %s kohdassa %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Eväste, joka tuli osoitteesta %s yritti asettaa verkkotunnukseksi " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Evästetiedoston %s avaaminen epäonnistui: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Virhe kirjoitettaessa tiedostoon %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Virhe suljettaessa tiedostoa %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Listaustyyppiä ei tueta, yritetään jäsentää unix-listauksena.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s indeksi kohteessa %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "tuntematon aika " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Tiedosto " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Hakemisto " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Linkki " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Epävarma " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s tavua)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Pituus: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) jäljellä" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s jäljellä" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (vahvistamaton)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Kirjaudutaan nimellä %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Virhe palvelimen vastauksessa. Hallintayhteys suljetaan.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Virhe palvelimen tervehdyksessä.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Kirjoitus epäonnistui. Hallintayhteys suljetaan.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Palvelin hylkäsi kirjautumisen.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Kirjautuminen epäonnistui.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Kirjauduttu!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Palvelinvirhe, järjestelmän tyypin määritteleminen epäonnistui.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "valmis. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "valmis.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tuntematon tyyppi â€%câ€. Hallintayhteys suljetaan.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "valmis." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD:tä ei tarvita.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Loogisesti mahdoton lohko tavoitettiin funktiolla getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -555,7 +530,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -564,37 +539,37 @@ msgstr "" "Hakemistoa %s ei ole.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD:tä ei vaadita.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Tiedosto on jo noudettu.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "PASV-siirron alustus epäonnistui.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "PASV-vastauksen jäsentäminen epäonnistui.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "yhdistäminen %s-porttiin %d epäonnistui: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind-virhe (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Virheellinen PORTTI.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -602,17 +577,17 @@ msgstr "" "\n" "REST epäonnistui, aloitetaan alusta.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Etätiedosto %s on olemassa.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Tiedostoa %s ei ole.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -621,7 +596,7 @@ msgstr "" "Tiedostoa %s ei ole.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -630,40 +605,40 @@ msgstr "" "Tiedostoa tai hakemistoa %s ei ole.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s on ilmestynyt.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, suljetaan hallintayhteys.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - tiedonsiirtoyhteys: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Hallintayhteys suljettu.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Tiedonsiirto keskeytetty.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Tiedostoa %s ei noudeta, koska se on jo paikalla.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(yritys:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -672,7 +647,7 @@ msgstr "" "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -681,35 +656,35 @@ msgstr "" "%s (%s) - %s tallennettu [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Poistetaan %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Listaus tallennetaan väliaikaisesti tiedostoon %s.\n" # Tähän lisäsin ylimääräisen sanan, jotta lause alkaisi isolla kirjaimella. -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Listatiedosto %s poistettu.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Rekursiosyvyys %d on ylittänyt sallitun syvyyden %d.\n" # Kahdessa seuraavassa olen otaksunut, että etätiedosto ja paikallinen ovat samannimisiä ja siksi tiedoston nimen paikkaa voi vaihtaa. -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Etätiedosto %s ei ole uudempi kuin paikallinen – ei noudeta.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -718,7 +693,7 @@ msgstr "" "Etätiedosto %s on uudempi kuin paikallinen – noudetaan.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -727,11 +702,11 @@ msgstr "" "Koot eivät täsmää (paikallinen %s) – noudetaan.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Symbolisen linkin nimi on virheellinen, ohitetaan.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -740,238 +715,238 @@ msgstr "" "Oikea symbolinen linkki %s -> %s on jo paikallaan.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Luodaan symbolinen linkki %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Ei tukea symbolisille linkeille, ohitetaan %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ohitetaan hakemisto %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tuntematon/tukematon tiedostotyyppi.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: vääristynyt aikaleima.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Hakemistoja ei noudeta, koska syvyys on %d (raja %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Hakemiston %s sisältöä ei noudeta, koska se on hylätty.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Hylätään %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Virhe kohteessa %s; se on erilainen kuin %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Hakulause %s ei löytänyt mitään.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML-muotoiltu indeksi on kirjoitettu tiedostoon %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML-muotoiltu indeksi on kirjoitettu tiedostoon %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "VIRHE: Hakemiston %s avaaminen epäonnistui.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "VIRHE: Varmenteen %s: (%d) avaaminen epäonnistui.\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Ladattu CA-varmenne ’%s’\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "VIRHE: CRL-tiedoston ’%s’ lataus epäonnistui: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Ladattu CRL-tiedosto ’%s’\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "VIRHE: GnuTLS vaatii samantyyppisen avaimen ja varmenteen.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Lähetä virheraportit tästä asiasta osoitteeseen bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "VIRHE" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "VAROITUS" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ei esittänyt varmennetta.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Varmenne %s ei ole luotettava.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Varmenteella %s ei ole tunnettua julkaisijaa.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Varmenne %s on vanhentunut.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Varmenteen %s allekirjoittaja ei ole CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Varmenne %s allekirjoitettiin turvattomalla algoritmilla.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Varmenne %s ei ole vielä aktivoitu.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Varmenne %s on vanhentunut.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Virhe alustettaessa X509-varmennetta: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Varmennetta ei löytynyt\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Virhe jäsennettäessä varmennetta: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Varmenne ei ole vielä voimassa\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Varmenne on vanhentunut\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Varmenteen omistaja ei täsmää verkkoaseman nimeen %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Varmenteen on oltava X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Virhe käsiteltäessä osoiteluetteloa.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Tuntematon verkkoasema" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Selvitetään osoitetta %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "epäonnistui: Verkkoasemalle ei ole IPv4/IPv6-osoitteita.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "epäonnistui: aikaraja ylittyi.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Epätäydellisen linkin %s ratkaiseminen epäonnistui.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: virheellinen verkko-osoite %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP-pyynnön kirjoitus epäonnistui: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Ei otsakkeita, oletetaan HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -980,133 +955,133 @@ msgstr "" "Tiedostoa %s ei noudeta, koska se on jo paikalla.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY data-tiedosto %s puuttuu: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Käytetään uudelleen yhteyttä [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Käytetään uudelleen yhteyttä %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Vastaanotto välityspalvelimelta epäonnistui: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s VIRHE %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Väärin muotoiltu Status-otsake" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Välityspalvelintunnelointi epäonnistui: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Tuntematon todennusjärjestelmä.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Todennus valittu: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Tallennetaan kohteeseen %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL otetaan pois päältä tapahtuneiden virheiden johdosta.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-pyyntö lähetetty, odotetaan vastausta... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Yhtään dataa ei vastaanotettu.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lukuvirhe (%s) otsakkeissa.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(ei kuvausta)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Sijainti: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "määrittelemätön" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [seurataan]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1114,7 +1089,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1124,81 +1099,81 @@ msgstr "" " Tiedosto on jo kokonaan noudettu.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Pituus: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "jätetty huomiotta" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varoitus: HTTP ei tue jokerimerkkejä.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Hakurobottitila aktivoitu. Tarkista, onko etätiedosto olemassa.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kirjoittaminen tiedostoon %s epäonnistui (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Vastaanotetusta otsakkeesta puuttuu vaadittu attribuutti.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Käyttäjätunnus-/Salasanatodennus epäonnistui.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Tilapäiseen WARC-tiedostoon kirjoittaminen epäonnistui.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "SSL-yhteyden muodostaminen ei onnistunut.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Linkin %s (%s) purkaminen epäonnistui.\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "VIRHE: Edelleenohjaus (%d) ilman sijaintia.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Etätiedostoa ei ole – rikkinäinen linkki!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "â€Last-modifiedâ€-otsake puuttuu – aikaleimat poistettu käytöstä.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "â€Last-modifiedâ€-otsake on virheellinen – aikaleima jätetty huomiotta.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1207,16 +1182,16 @@ msgstr "" "Palvelimen tiedosto %s ei ole paikallista uudempi – ei noudeta.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Koot eivät täsmää (paikallinen %s) – noudetaan.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Etätiedosto on uudempi, noudetaan.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1226,7 +1201,7 @@ msgstr "" "noudetaan.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1235,7 +1210,7 @@ msgstr "" "\n" # Tämä kuten useat aiemmat yllä ovat lokitiedostorivejä, joilla kommentoidaan hakurobotin tekemisiä ja tekemättä jättämisiä. -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1245,7 +1220,7 @@ msgstr "" "Rekursio ei kuitenkaan ole käytössä, joten linkkejä ei seurata.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1253,12 +1228,12 @@ msgstr "" "Etätiedosto on olemassa.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s VERKKO-OSOITE: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1267,7 +1242,7 @@ msgstr "" "%s (%s) - kirjoitettu vakiotulosteeseen %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1276,58 +1251,58 @@ msgstr "" "%s (%s) - %s tallennettu [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Yhteys suljettu tavun %s kohdalla. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lukuvirhe tavun %s kohdalla (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lukuvirhe tavun %s/%s kohdalla (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Tukematon suojauslaatu ’%s’.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Tukematon algoritmi ’%s’.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC osoittaa kohteeseen %s, jota ei ole olemassa.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kohteen %s (%s) lukeminen epäonnistui.\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Virhe kohdassa %s rivillä %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksivirhe kohdassa %s rivillä %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Tuntematon komento %s kohdassa %s rivillä %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1339,7 +1314,7 @@ msgstr "" "'%s',\n" "tai määritä eri tiedosto valitsimella --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1350,77 +1325,77 @@ msgstr "" "'%s',\n" "tai määritä eri tiedosto valitsimella --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Varoitus: Sekä järjestelmän että käyttäjän wgetrc osoittavat tiedostoon " "%s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Komento --execute %s on virheellinen\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Virheellinen boolean %s, valitse â€on†tai â€offâ€.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Virheellinen boolean %s, valitse â€on†tai â€offâ€.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Numero %s on virheellinen.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s on käytettävä vain kerran\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Tavun arvo %s on virheellinen.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Aikaväli %s on virheellinen\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Arvo %s on virheellinen.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Otsake %s on virheellinen.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Virheellinen WARC-otsake %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Edistymistyyppi %s on virheellinen.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1429,40 +1404,40 @@ msgstr "" "%s: %s: Virheellinen rajoite %s,\n" " valitse [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Koodaus %s on virheellinen\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, fuzzy, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Muunnosta muodosta %s muotoon UTF-8 ei tueta\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Kohdattu puutteellinen tai virheellinen monitavusekvenssi\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Käsittelemätön errno-virhenumero %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: lokaalia ei ole asetettu\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode ei onnistunut (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "yhdistäminen %s-porttiin %d epäonnistui: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1471,17 +1446,17 @@ msgstr "" "\n" "%s vastaanotettu, ohjataan tulostus tiedostoon %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; loki poistettu käytöstä.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Käyttö: %s [VALITSIN]... [VERKKO-OSOITE]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1489,67 +1464,67 @@ msgstr "" "Pakolliset argumentit pitkille valitsimille ovat pakollisia myös lyhyille.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Käynnistys:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version näytä Wget-versio ja lopeta\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help näytä tämä ohje\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background siirry taustalle käynnistyksen jälkeen\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMENTO suorita â€.wgetrcâ€-tyylinen komento\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Loki- ja syötetiedostot:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=TIEDOSTO kirjaa viestit TIEDOSTOon\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=TIEDOSTO lisää viestit TIEDOSTOon\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug näytä paljon vianetsintätietoja\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug näytä â€Watt-32â€-virheenjäljitystuloste\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ole hiljaa (ei tulostusta)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose näytä yksityiskohtia (oletus)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose ei yksityiskohtia, muttei hiljainen\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1557,7 +1532,7 @@ msgstr "" " --report-speed=TYYPPI Tulosta kaistanleveys TYYPPInä. TYYPPI voi " "olla bittejä\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1565,7 +1540,7 @@ msgstr "" " -i, --input-file=TIEDOSTO lataa paikalliset tai ulkoisesta\n" " TIEDOSTOsta löydetyt verkko-osoitteet\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1574,11 +1549,11 @@ msgstr "" " --metalink-file lataa paikalliset tai ulkoisesta metalink-" "TIEDOSTOsta löydetyt verkko-osoitteet.\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html käsittele syötetiedosto HTML:nä\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1587,44 +1562,44 @@ msgstr "" "F)\n" " VERKKO-OSOITE-osoitteen suhteen\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=TIEDOSTO Määritä käytettävä config-tiedosto\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-cookies älä lue mitään config-tiedostoa\n" -#: src/main.c:620 +#: src/main.c:629 #, fuzzy msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " -o, --output-file=TIEDOSTO kirjaa viestit TIEDOSTOon\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Noutaminen:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=MÄÄRÄ yrityskertojen MÄÄRÄ (0 on rajaton)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused yritä uudelleen vaikka yhteys " "torjuttaisiin\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=TIEDOSTO kirjoita dokumentit TIEDOSTOon\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1632,14 +1607,14 @@ msgstr "" " -nc, --no-clobber ohita noudot, jotka korvaisivat jo\n" " olemassaolevia tiedostoja\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies älä lue mitään config-tiedostoa\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1647,7 +1622,7 @@ msgstr "" " -c, --continue jatka osittain noudetun tiedoston " "noutamista\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1655,11 +1630,11 @@ msgstr "" " --start-pos=OFFSET aloita lataaminen nollaperustaisesta " "OFFSET-osoitteesta\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYYPPI valitse edistymismittarin tyyppi\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1667,7 +1642,7 @@ msgstr "" " --show-progress näytä edistymispalli kaikissa " "tulostustiloissa\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1676,7 +1651,7 @@ msgstr "" " -N, --timestamping nouda vain paikallista uudemmat " "tiedostot\n" -#: src/main.c:648 +#: src/main.c:657 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1687,7 +1662,7 @@ msgstr "" "aikaleimaa\n" " palvelimen aikaleimalla\n" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1697,25 +1672,25 @@ msgstr "" "aikaleimaa\n" " palvelimen aikaleimalla\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response näytä palvelimen vastaus\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider älä nouda mitään\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEKUNTIA kaikkien aikakatkaisujen pituus\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1724,24 +1699,24 @@ msgstr "" " --bind-address=OSOITE liitä (verkkoasema- tai IP-) OSOITE " "paikallisesti\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNTIA nimipalveluhaun aikakatkaisun pituus\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SEKUNTIA yhdistämisen aikakatkaisun pituus\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEKUNTIA vastaanoton aikakatkaisun pituus\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNTIA odota SEKUNTIA noutojen välillä\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1749,7 +1724,7 @@ msgstr "" " --waitretry=SEKUNTIA odota 1...SEKUNTIA noutojen " "uudelleenyritysten välillä\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1757,15 +1732,15 @@ msgstr "" " --random-wait odota 0.5*WAIT...1.5*WAIT sekuntia " "noutojen välillä\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy välityspalvelin pois päältä\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=LUKU noutokiintiön koko\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1773,17 +1748,17 @@ msgstr "" " --bind-address=OSOITE liitä (verkkoasema- tai IP-) OSOITE " "paikallisesti\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=NOPEUS rajoita noutoNOPEUS\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache älä säilytä nimipalvelutietoja " "välimuistissa\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1791,7 +1766,7 @@ msgstr "" " --restrict-file-names=KJ käytä vain käyttöjärjestelmän\n" " sallimia tiedostonimiä\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1800,17 +1775,17 @@ msgstr "" "verrataan\n" " tiedostoja/hakemistoja\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only ota yhteyttä vain IPv4-osoitteisiin\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only ota yhteyttä vain IPv6-osoitteisiin\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1820,20 +1795,20 @@ msgstr "" "osoitteeseen,\n" " vaihtoedot: IPv6, IPv4 tai none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=KÄYTTÄJÄ FTP- ja HTTP-käyttäjänimi\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=SALASANA FTP- ja HTTP-salasana\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --password=SALASANA kehote salasanoille\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1844,113 +1819,112 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI-tuki pois päältä\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC käytä ENC paikallisena koodauksena IRI-" "kohteille\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC käytä ENC etäkoodauksen oletuksena\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink poista tiedosto ennen päällekirjoitusta\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" -msgstr " -Q, --quota=LUKU noutokiintiön koko\n" +msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-glob älä täydennä tiedostonimiä\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Hakemistot:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories älä luo hakemistoja\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories pakotettu hakemistojen luonti\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories älä luo verkkoasemahakemistoja\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories käytä yhteyskäytännön nimeä " "hakemistoissa\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=ETULIITE tallenna tiedostot hakemistoon " "ETULIITE/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=LUKU ohita ensimmäiset LUKU hakemistoa\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-valitsimet:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=KÄYTTÄJÄ HTTP-käyttäjänimi\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=SALASANA HTTP-salasana\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache älä käytä palvelimelle välivarastoitua " "dataa\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1958,7 +1932,7 @@ msgstr "" " --default-page=NIMI Vaihda oletussivun nimi (normaalisti\n" " se on â€index.htmlâ€.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1966,41 +1940,41 @@ msgstr "" " -E, --adjust-extension tallenna HTML/CSS-dokumentit oikeilla " "tiedostonimipäätteillä\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length älä välitä â€Content-Lengthâ€-" "otsakekentästä\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=MERKKIJONO lisää MERKKIJONO otsakkeiden sekaan\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYYPPI valitse edistymismittarin tyyppi\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect uudelleenohjausten sallittu maksimimäärä " "sivua kohden\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=KÄYTTÄJÄ välityspalvelimen käyttäjänimi\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=SALASANA välityspalvelimen salasana\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2008,12 +1982,12 @@ msgstr "" " --referer=VERKKO-OSOITE liitä â€Referer: URLâ€-otsake HTTP-" "pyyntöön\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers tallenna HTTP-otsakkeet tiedostoon\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2021,30 +1995,30 @@ msgstr "" " -U, --user-agent=AGENTTI tunnistaudu Wget/version sijasta AGENTTI-" "käyttäjäksi\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" " --no-http-keep-alive ota pois käytöstä jatkuvat yhteydet\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies älä käytä evästeitä\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=TIEDOSTO lue evästeet ennen istuntoa TIEDOSTOsta\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=TIEDOSTO tallenna evästeet istunnon jälkeen " "TIEDOSTOon\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2052,7 +2026,7 @@ msgstr "" " --keep-session-cookies hae ja tallenna (väliaikaiset) " "istuntoevästeet\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2060,7 +2034,7 @@ msgstr "" " --post-data=MERKKIJONO käytä POST-metodia; lähetä MERKKIJONO " "datana\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2068,13 +2042,13 @@ msgstr "" " --post-file=TIEDOSTO käytä POST-metodia; lähetä TIEDOSTOn " "sisältö\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod käytä metodia â€HTTPMethod†otsakkeessa\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2082,7 +2056,7 @@ msgstr "" " --body-data=MERKKIJONO Lähetä MERKKIJONO datana. Valitsin --" "method ON asetettava\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2090,7 +2064,7 @@ msgstr "" " --body-file=TIEDOSTO Lähetä TIEDOSTOn sisältö. Valitsin --" "method ON asetettava\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2102,7 +2076,7 @@ msgstr "" " valitaan paikalliset tiedostonimet " "(KOKEELLINEN)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2111,7 +2085,7 @@ msgstr "" "palvelinvirheinä\n" # Challenge viittaa tässä ilmeisesti challenge-response method eli haastemenetelmään -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2122,11 +2096,11 @@ msgstr "" " odottamatta ensin palvelimen\n" " haastetta\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) -valitsimet:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2136,51 +2110,51 @@ msgstr "" " --secure-protocol=PR valitse turvayhteyskäytäntö, vaihtoehdot:\n" " auto, SSLv2, SSLv3, TLSv1 ja PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only seuraa vain turvallisia HTTPS-linkkejä\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate älä tarkista palvelimen varmennetta\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=TIEDOSTO asiakasvarmenne\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYYPPI asiakasvarmenteen tyyppi: PEM tai DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=TIEDOSTO salainen avain\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYYPPI salaisen avaimen tyyppi: PEM tai DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=TIEDOSTO juurivarmennekokoelma\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=HAKEMISTO juurivarmenteiden hajautuslista\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=TIEDOSTO juurivarmennekokoelma\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2190,44 +2164,44 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=TIEDOSTO satunnaista dataa SSL PRNG:n siemeneksi\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" " --egd-file=TIEDOSTO EGD-vastake, josta saa satunnaista dataa\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP-valitsimet:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache älä käytä palvelimelle välivarastoitua " "dataa\n" -#: src/main.c:861 +#: src/main.c:870 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose näytä yksityiskohtia (oletus)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-valitsimet:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2235,34 +2209,34 @@ msgstr "" " --ftp-stmlf Käytä â€Stream_LFâ€-muotoa kaikille " "binäärisille FTP-tiedostoille\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=KÄYTTÄJÄ FTP-käyttäjänimi\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SALASANA FTP-salasana\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing älä poista â€.listingâ€-tiedostoja\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob älä täydennä tiedostonimiä\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp älä käytä â€passiivista†siirtotapaa\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions säilytä noudetun tiedoston oikeudet\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2270,12 +2244,12 @@ msgstr "" " --retr-symlinks rekursiossa: hae linkitetyt tiedostot\n" " (ei hakemistoja)\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "FTP-valitsimet:\n" -#: src/main.c:891 +#: src/main.c:900 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2284,7 +2258,7 @@ msgstr "" " --ftp-stmlf Käytä â€Stream_LFâ€-muotoa kaikille " "binäärisille FTP-tiedostoille\n" -#: src/main.c:893 +#: src/main.c:902 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2295,23 +2269,23 @@ msgstr "" "osoitteen\n" " viimeisen komponentin edelleenohjaus\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC-valitsimet:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2319,24 +2293,24 @@ msgstr "" " --warc-file=TIEDOSTONIMI tallenna pyyntö-/vastaustiedot tiedostoon ." "warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=MERKKIJONO lisää MERKKIJONO warcinto-tietueeseen\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMERO aseta WARC-tiedostojen enimmäiskoko " "NUMEROksi\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx kirjoita CDX-indeksitiedostot\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2344,18 +2318,18 @@ msgstr "" " --warc-dedup=TIEDOSTONIMI älä tallenna CDX-tiedostossa lueteltuja " "tietueita\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression älä tiivistä WARC-tiedostoja GZIP-" "ohjelmalla\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests älä laske SHA1-tiivisteitä\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2363,7 +2337,7 @@ msgstr "" " --no-warc-keep-log älä tallenna lokitiedostoa WARC-" "tietueeseen\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2373,28 +2347,28 @@ msgstr "" "tiedostojen\n" " sijainti\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursiivinen nouto:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nouda rekursiivisesti\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" " -l, --level=LUKU rekursiosyvyys (inf ja 0 = ääretön)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after poista tiedostot haun jälkeen\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2404,13 +2378,13 @@ msgstr "" "linkit\n" " osoittamaan paikallisiin tiedostoihin\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2418,7 +2392,7 @@ msgstr "" " --backups=N palauta ennen tiedoston X kirjoittamista N " "varmuuskopiotiedostoa\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2426,7 +2400,7 @@ msgstr "" " -K, --backup-converted ennen tiedoston X muuttamista,\n" " varmuuskopioi nimellä â€X.origâ€\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2434,7 +2408,7 @@ msgstr "" " -K, --backup-converted ennen tiedoston X muuttamista,\n" " varmuuskopioi nimellä â€X.origâ€\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2442,7 +2416,7 @@ msgstr "" " -m, --mirror oikovalitsin, yhtäkuin -r -N -l inf\n" " --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2450,7 +2424,7 @@ msgstr "" " -p, --page-requisites nouda kaikki kuvat yms. HTML-sivun\n" " näyttämiseen tarvittava\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2458,90 +2432,90 @@ msgstr "" " --strict-comments käytä HTML-kommenttien tiukkaa\n" " (SGML) käsittelyä\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" "Rekursiivinen hyväksyntä/hylkäys:\n" "(listojen osat erotellaan pilkuin)\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LISTA lista hyväksytyistä päätteistä\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LISTA lista hylätyistä päätteistä\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX säännöllisten lauseiden täsmäys " "hyväksyttyihin verkko-osoitteisiin\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX säännöllisten lauseiden täsmäys " "torjuttuihin verkko-osoitteisiin\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYYPPI säännöllisen lauseen tyyppi (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYYPPI säännöllisen lauseen tyyppi (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTA lista hyväksytyistä verkkotunnuksista\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTA lista hylätyistä verkkotunnuksista\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp seuraa ftp-linkkejä HTML-dokumenteista\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=LISTA lista seurattavista HTML-tageista\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=LISTA lista ohitettavista HTML-tageista\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts siirry rekursiossa eri verkkoasemalle\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative seuraa vain suhteellisia linkkejä\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista hyväksytyistä hakemistoista\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2551,16 +2525,16 @@ msgstr "" "osoitteen\n" " viimeisen komponentin edelleenohjaus\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista hylätyistä hakemistoista\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent älä nouse hakemistorakenteessa\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Ilmoita virheistä ja ehdotuksista (englanniksi) osoitteeseen \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, ei-vuorovaikutteinen tiedostojen noutaja.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Salasana käyttäjälle %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Salasana: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "putken luominen epäonnistui" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Salasana käyttäjälle %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokaali: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Käännä: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Linkitä: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2638,29 +2612,29 @@ msgstr "" "GNU Wget %s käännetty järjestelmään %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (ympäristö)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (käyttäjä)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (järjestelmä)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2675,7 +2649,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2683,36 +2657,36 @@ msgstr "" "\n" "Alunperin kirjoittanut Hrvoje NikÅ¡ić .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Lähetä virheraportit ja kysymykset osoitteeseen .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Muistinvarauspulma\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Poistutaan virheen vuoksi kohteessa %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Kirjoita â€%s --help†saadaksesi lisää valitsimia.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: virheellinen valitsin – â€-n%câ€\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Vianjäljitystukea ei ole käännetty mukaan. Ohitetaan --debug-lippu.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2721,7 +2695,7 @@ msgstr "" "On määritelty sekä --no-clobber että --convert-links -valitsimet, vain " "valitsinta --convert-links käytetään.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2730,24 +2704,24 @@ msgstr "" "On määritelty sekä --no-clobber että --convert-links -valitsimet, vain " "valitsinta --convert-links käytetään.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ei voi näyttää yksityiskohtia ja olla hiljaa yhtä aikaa.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Vanhoja tiedostoja ei voi aikaleimata ja jättää koskematta yhtä aikaa.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "Argumentteja â€--inet4-only†ja â€--inet6-only†ei voi käyttää yhtä aikaa.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2760,7 +2734,7 @@ msgstr "" "yhdessä argumenttien â€-p†tai â€-r†kanssa. Lisätietoja käsikirjasta.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2771,7 +2745,7 @@ msgstr "" "ladattu sisältö sijoitetaan yhteen määrittelemääsi tiedostoon.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2782,12 +2756,7 @@ msgstr "" "käsikirjasta.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Tiedostoa â€%s†ei noudeta, koska se on jo paikalla.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2795,7 +2764,7 @@ msgstr "" "WARC-tuloste ei toimi valitsimen --no-clobber kanssa, --no-clobber otetaan " "pois käytöstä.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2803,12 +2772,12 @@ msgstr "" "WARC-tuloste ei toimi aikaleimauksen kanssa, aikaleimaus otetaan pois " "käytöstä.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-tuloste ei toimi valitsimen --spider kanssa.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2817,7 +2786,7 @@ msgstr "" "WARC-tuloste ei toimi valitsimen --continue tai --start-pos kanssa, ne " "otetaan pois käytöstä.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2825,7 +2794,7 @@ msgstr "" "Tiivisteen on otettu pois käytöstä; WARC-uudelleenkahdentuma ei löydä " "tietueiden kaksoiskappaleita.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2834,13 +2803,13 @@ msgstr "" "WARC-tuloste ei toimi valitsimen --continue tai --start-pos kanssa, ne " "otetaan pois käytöstä.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Argumentteja â€--ask-password†ja â€--password†ei voi käyttää yhtä aikaa.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2849,17 +2818,17 @@ msgstr "" "Sekä valitsimen --start-pos että valitsimen --continue määrittelyä ei " "suositella; --continue otetaan pois käytöstä.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: VERKKO-OSOITE puuttuu\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Valitsimia --post-data ja --post-file ei voi määritellä yhtä aikaa.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2869,7 +2838,7 @@ msgstr "" "kanssa. Valitsin --method odottaa dataa valitsimien --body-data ja --body-" "file kautta" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2878,17 +2847,17 @@ msgstr "" "Metodi on määriteltävä valitsimen --method=HTTPMethod kautta käytettäväksi " "valitsimella --body-data tai --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Valitsimia --body-data ja --body-file ei voi määritellä yhtä aikaa.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Tässä versiossa ei tueta IRI:jä\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2896,7 +2865,7 @@ msgstr "" "valitsinta -k voidaan käyttää yhdessä valitsimen -O kanssa vain jos " "tulostetaan tavalliseen tiedostoon.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2905,42 +2874,42 @@ msgstr "" "valitsinta -k voidaan käyttää yhdessä valitsimen -O kanssa vain jos " "tulostetaan tavalliseen tiedostoon.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: verkkoasemaosoitteen %s ratkaiseminen epäonnistui\n" -#: src/main.c:2008 +#: src/main.c:2017 #, fuzzy, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "VIRHE: Varmenteen %s: (%d) avaaminen epäonnistui.\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Tiedostosta %s ei löytynyt verkko-osoitteita.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Tiedoston %s poistaminen epäonnistui: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2951,7 +2920,7 @@ msgstr "" "Muurikelloaika yhteensä: %s\n" "Noudettu: %d tiedostoa, %s kohteessa %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Haun %s:n tavun kiintiö YLITETTY!\n" @@ -3110,107 +3079,107 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Poistetaan %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Ohjelman suoritus jatkuu taustalla.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Ohjelman suoritus jatkuu taustalla, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Tuloste kirjoitetaan tiedostoon %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() epäonnistui\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() epäonnistui\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Käyttökelpoisen vastakeajurin löytäminen epäonnistui.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() epäonnistui. Vastakkeen asettaminen estävänä epäonnistui.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: varoitus: %s-merkintä esiintyy kaikkien koneiden nimien edessä\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: tuntematon merkki â€%sâ€\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Käyttö: %s NETRC [VERKKOASEMAN NIMI]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: tiedoston %s tilan ei lukeminen epäonnistui: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "VAROITUS: satunnaislukujen lähde on heikkolaatuinen.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "PRNG:n alustaminen epäonnistui; harkitse â€--random-fileâ€-valitsimen " "käyttöä.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "OpenSSL-versiosi on liian vanha tukemaan TLSv1.1-yhteyskäytäntöä\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "OpenSSL-versiosi on liian vanha tukemaan TLSv1.2-yhteyskäytäntöä\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: toteuttamaton ’secure-protocol’-valitsinarvo %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: kohteen %s varmenteen todentaminen epäonnistui, myöntäjä: %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Myöntäjän valtuutuksen todentaminen paikallisesti epäonnistui.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Itse allekirjoitettu varmenne kohdattu.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Varmenne ei ole vielä voimassa.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Varmenne on vanhentunut.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3219,7 +3188,7 @@ msgstr "" "%s: varmenteen aiheen vaihtoehtoinen nimi ei täsmää\n" "\tpyydetyn verkkoaseman nimen %s kanssa.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3227,7 +3196,7 @@ msgstr "" " %s: varmenteen yleinen nimi %s ei täsmää pyydetyn verkkoaseman nimeen " "%s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3239,14 +3208,14 @@ msgstr "" "väittää\n" " olevansa (toisin sanoen, se ei todella ole %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Ottaaksesi yhteyden kohteeseen %s:n turvattomasti, käytä â€--no-check-" "certificateâ€-valitsinta.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3255,7 +3224,7 @@ msgstr "" "\n" "%*s[ ohitetaan %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Pistetyylin määrittely %s on virheellinen; jätetään muuttamatta.\n" @@ -3263,22 +3232,22 @@ msgstr "Pistetyylin määrittely %s on virheellinen; jätetään muuttamatta.\n" # Tämä ja seuraava ovat täysiä arvoituksia. #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " kohteessa " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "REAALIAIKAkellon taajuutta ei saatu: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Poistetaan %s, koska sen pitäisi olla hylätty.\n" @@ -3292,22 +3261,22 @@ msgstr "Tiedoston %s avaaminen epäonnistui: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ladataan robots.txt, älä välitä virheistä.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Virhe tulkittaessa välityspalvelimen verkko-osoitetta %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Virhe välityspalvelimen verkko-osoitteessa %s: Sen täytyy olla HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d edelleenohjausta ylitetty.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3315,7 +3284,7 @@ msgstr "" "Luovutetaan.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3323,125 +3292,125 @@ msgstr "" "Yritetään uudelleen.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ei virhettä" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Kaavaa %s ei tueta" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Kaava puuttuu" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Verkkoaseman nimi on virheellinen" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Portin numero on virheellinen" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Käyttäjätunnus on virheellinen" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Päättämätön numeerinen IPv6-osoite" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-osoitteita ei tueta" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Virheellinen numeerinen IPv6-osoite" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS-tukea ei ole käännetty koodiin" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Kohdattu puutteellinen tai virheellinen monitavusekvenssi\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Riittävän muistin varaaminen epäonnistui, muisti loppui.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Muisti loppui, %ld tavun varaaminen epäonnistui.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: tekstipuskuri on liian iso (%ld tavua), keskeytetään.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ohjelman suoritus jatkuu taustalla, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" +msgstr "VIRHE: Varmenteen %s: (%d) avaaminen epäonnistui.\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: verkkoasemaosoitteen %s ratkaiseminen epäonnistui\n" +msgstr "VIRHE: Varmenteen %s: (%d) avaaminen epäonnistui.\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Evästeiden hakeminen kohteelle %s epäonnistui\n" +msgstr "Symbolisen linkin %s poistaminen epäonnistui: %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Virheellinen säännöllinen lauseke %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Virhe täsmättäessä tiedostoon %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3529,6 +3498,31 @@ msgstr "" "Tarkka vastaavuus löytyi CDX-tiedostossa. Tallennetaan revisit-tietue WARC-" "tiedostoon.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: tunnistamaton valitsin ’--%s’\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "idn_decode ei onnistunut (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s vastaanotettu.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Tiedostoa â€%s†ei noudeta, koska se on jo paikalla.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3549,20 +3543,6 @@ msgstr "" #~ "Löydettiin %d rikkinäistä linkkiä.\n" #~ "\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: virheellinen verkko-osoite %s: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "idn_decode ei onnistunut (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s vastaanotettu.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Todentaminen epäonnistui.\n" diff --git a/po/fr.gmo b/po/fr.gmo index db370ce..b8205f8 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index e5bf5de..90a8612 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-04-30 03:34+0200\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -22,7 +22,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -30,7 +30,7 @@ msgstr "Erreur système inconnue" msgid "Address family for hostname not supported" msgstr "Famille d’adresses non prise en charge pour le nom d’hôte" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Échec temporaire de résolution de noms" @@ -98,70 +98,45 @@ msgstr "Interrompu par un signal" msgid "Parameter string not correctly encoded" msgstr "Chaîne de paramètres non encodée correctement" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Erreur inconnue" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s : l’option « %s » est ambiguë ; possibilités :" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s : l’option « %s » est ambiguë\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s : l’option « --%s » n’accepte pas d’argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s : l’option « %s » est ambiguë ; possibilités :" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s : l’option « %c%s » n’est pas reconnue\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s : l’option « %c%s » n’accepte pas d’argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s : l’option « --%s » nécessite un argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s : l’option « --%s » n’est pas reconnue\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s : l’option « %c%s » n’est pas reconnue\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s : option incorrecte — « %c »\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s : l’option nécessite un argument — « %c »\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s : l’option « -W %s » est ambiguë\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s : l’option « -W %s » n’accepte pas d’argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s : l’option « -W %s » nécessite un argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -181,13 +156,13 @@ msgstr "%s : l’option « -W %s » nécessite un argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "« " -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr " »" @@ -259,28 +234,28 @@ msgstr "Expression rationnelle trop grande" msgid "Unmatched ) or \\)" msgstr ") ou \\) sans correspondance" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Pas d’expression rationnelle précédente" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "impossible de créer le tube" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "échec du sous-processus %s" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "échec de _open_osfhandle" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "impossible de restaurer le descripteur de fichier %d : échec de dup2" @@ -299,53 +274,53 @@ msgstr "le sous-processus %s a reçu le signal %d fatal" msgid "memory exhausted" msgstr "mémoire épuisée" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s : impossible de résoudre l’adresse liée %s ; désactivation de liaison " "(« bind »).\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Connexion à %s|%s|:%d… " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Connexion à %s:%d… " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Connexion à [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF échouée : %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "connecté.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "échec : %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s : impossible de résoudre l’adresse de l’hôte %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR échouée : %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -381,176 +356,176 @@ msgstr "Impossible de supprimer %s : %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Impossible d’archiver %s en %s : %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Impossible d’obtenir le cookie pour %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Erreur de syntaxe dans Set-Cookie: %s à la position %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Un cookie provenant de %s a tenté de changer le domaine en " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Impossible d’ouvrir le fichier des cookies %s : %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Erreur d’écriture dans %s : %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Erreur de fermeture pour %s : %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Type d’affichage non pris en charge, essai avec l’analyseur d’affichage de " "type UNIX.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index de /%s sur %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "heure inconnue " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fichier " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Répertoire " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Lien " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Incertain " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s octets)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Taille : %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restant" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s restant" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (non certifiée)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Imposisble d’initialiser SSL. Il sera désactivé." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Ouverture de session en tant que %s… " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Erreur de réponse du serveur, fermeture de la connexion de contrôle.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Erreur de message de salutation du serveur.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Échec d’écriture, fermeture de la connexion de contrôle.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Le serveur refuse l’établissement de session.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Erreur d’établissement de session.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Session établie.\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Le serveur n’a pas accepté la commande « PBSZ 0 »\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Le serveur n’a pas accepté la commande « PROT %c »\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Erreur du serveur, impossible de déterminer le type de système.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "terminé. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "terminé.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Type « %c » inconnu, fermeture de la connexion de contrôle.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "terminé. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD n’est pas nécessaire.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Section logiquement impossible atteinte par getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -561,7 +536,7 @@ msgstr "" " début_cwd : %d\n" " fin_cwd : %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -570,37 +545,37 @@ msgstr "" "Répertoire %s inexistant.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD n’est pas nécessaire.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Fichier déjà récupéré.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Impossible d’initier le transfert PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Impossible d’analyser la réponse PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "impossible d’établir la connexion à %s sur le port %d : %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Erreur de liaison (« bind ») (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Port incorrect.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -608,17 +583,17 @@ msgstr "" "\n" "ÉCHEC de REST, reprise depuis le début.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Le fichier %s existe.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Fichier %s inexistant.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -627,7 +602,7 @@ msgstr "" "Fichier %s inexistant.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -636,40 +611,40 @@ msgstr "" "Fichier ou répertoire %s inexistants.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s vient de s’annoncer comme existante.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s : %s, fermeture de la connexion de contrôle.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) — Connexion de transfert de données : %s ; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Connexion de contrôle fermée.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Abandon du transfert des données.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Fichier %s déjà présent ; pas de récupération.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(essai : %2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -678,7 +653,7 @@ msgstr "" "%s (%s) — envoi sur la sortie standard %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -687,35 +662,35 @@ msgstr "" "%s (%s) - %s sauvegardé [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Destruction de %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Utilisation de %s comme fichier temporaire d’affichage.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s supprimé.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Le niveau %d de récursivité dépasse le niveau maximal %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Le fichier distant n’est pas plus récent que le fichier local %s — pas de " "récupération.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -724,7 +699,7 @@ msgstr "" "Le fichier distant est plus récent que le fichier local %s — récupération.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -733,11 +708,11 @@ msgstr "" "Les tailles ne concordent pas (%s localement) — récupération.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nom de lien symbolique incorrect, ignoré.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -746,247 +721,247 @@ msgstr "" "Lien symbolique %s → %s déjà correct\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Création du lien symbolique %s → %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Liens symboliques non pris en charge, lien %s ignoré.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Répertoire %s ignoré.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s : type de fichier inconnu ou non pris en charge.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Impossible de définir les permissions pour %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s : horodatage corrompu.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Les répertoires ne seront pas récupérés, le niveau %d dépasse le maximum " "%d.\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "%s non parcouru puisqu’il est exclu ou non inclus.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Rejet de %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Erreur — %s ne correspond pas à %s : %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Pas de concordance pour le motif %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Index écrit sous forme HTML dans %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Index écrit sous forme HTML dans %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Erreur : impossible d’ouvrir le répertoire %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "Erreur : échec d’ouverture du certificat %s : (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Certificat de l’autorité de certification « %s » chargé\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" "Erreur : échec de chargement du fichier de liste de révocations de " "certificat « %s » : (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Fichier de liste de révocations de certificat « %s » chargé\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "Erreur : GnuTLS nécessite que la clef et le certificat soient de même type.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" "GnuTLS : valeur %d pour l’option « secure-protocol » non prise en charge\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Veuillez signaler cette anomalie à \n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" "GnuTLS : valeur %d pour l’option « secure-protocol » non prise en charge\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "Erreur" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "Avertissement" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s : pas de certificat présenté par %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s : le certificat de %s n’est pas de confiance.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s : le certificat de %s n’est pas d’un émetteur connu.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s : le certificat de %s a été révoqué.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s : le signataire de certificat de %s n’était pas une autorité.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s : le certificat de %s a été signé avec un algorithme non sécurisé.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s : le certificat de %s n’est pas encore activé.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s : le certificat de %s a expiré.\n" # FIXME: s/X509/X.509/ -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Erreur d’initialisation du certificat X.509 : %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Aucun certificat trouvé\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Erreur d’analyse du certificat : %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Le certificat n’est pas encore activé\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Le certificat a expiré\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Le propriétaire du certificat ne correspond pas au nom d’hôte %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "La clef publique ne correspond pas à la clef publique fixe !\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Le certificat doit être X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Erreur dans le traitement de la liste d’adresses.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Hôte inconnu" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Résolution de %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "échec : pas d’adresse IPv4 ou IPv6 pour l’hôte.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "échec : délai d’attente expiré.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s : impossible de résoudre le lien incomplet %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s : URL %s incorrecte : %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Échec d’écriture de la requête HTTP : %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Pas d’en-tête, HTTP/0.9 supposé" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -995,11 +970,11 @@ msgstr "" "Fichier %s déjà présent ; pas de récupération.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "Échec de gmtime. C’est probablement un bogue.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1007,56 +982,56 @@ msgstr "" "Impossible de convertir de timestamp au format HTTP. Utilisera l’heure 0 " "comme da te de dernière modification.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Fichier de données BODY %s manquant : %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Réutilisation de la connexion existante à [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Réutilisation de la connexion existante à %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "" "Échec de lecture de la réponse du serveur mandataire (« proxy ») : %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s erreur %d : %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Ligne d’état mal formée" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Échec de tunnel du serveur mandataire (« proxy ») : %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Schéma d’authentification inconnu.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Authentification sélectionnée : %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Sauvegarde en : %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1065,24 +1040,24 @@ msgstr "" "Pendant du téléchargement de signature:\n" "%s : %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Impossible de lire le contenu de la signature depuis le fichier temporaire. " "Ignoré.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Imposisble de créer le fichier temporaire. Sauter le téléchargement de la " "signature.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valeur pri invalide. Suppose %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1090,42 +1065,42 @@ msgstr "" "Impossible de trouver un digest acceptable pour les ressources Metalink.\n" "Les ignorer.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Désactivation SSL à cause des erreurs rencontrées.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "requête %s transmise, en attente de la réponse… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Aucune donnée reçue.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erreur de lecture (%s) dans les en-têtes.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(pas de description)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Emplacement : %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "non indiqué" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [suivant]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1134,7 +1109,7 @@ msgstr "" "Le fichier %s n’a pas été modifier sur le serveur. Téléchargement sauté.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1145,7 +1120,7 @@ msgstr "" "Vous pourriez vouloir ajouter l’option --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1155,59 +1130,59 @@ msgstr "" " Le fichier a déjà été complètement récupéré ; rien à faire.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Taille : " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignoré" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertissement : les jokers ne sont pas permis en HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Mode « spider » activé. Vérification de l’existence d’un fichier distant.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossible d’écrire dans %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Attribut nécessaire manquant dans l’en-tête reçu.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Échec d’authentification par identifiant et mot de passe.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossible d’écrire dans le fichier WARC temporaire.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Incapable d’établir une connexion SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossible de supprimer le lien %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Erreur : redirection (%d) sans destination.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1215,23 +1190,23 @@ msgstr "" "Impossible de trouver les données Metalink dans la réponse HTTP. " "Téléchargement du fichier via HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Entêtes Metalink trouvées. Passage en mode Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Le fichier distant n’existe pas — lien mort.\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "En-tête de dernière modification manquant — horodatage arrêté.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "En-tête de dernière modification incorrect — horodatage ignoré.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1241,16 +1216,16 @@ msgstr "" "récupération.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Les tailles ne correspondent pas (%s localement) — récupération.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Le fichier distant est plus récent, récupération.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1260,7 +1235,7 @@ msgstr "" "ressources — récupération en cours.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1269,7 +1244,7 @@ msgstr "" "récupération.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1279,7 +1254,7 @@ msgstr "" "mais le mode récursif est désactivée — pas de récupération.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1287,12 +1262,12 @@ msgstr "" "Le fichier distant existe.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s : %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1301,7 +1276,7 @@ msgstr "" "%s (%s) — envoi vers sortie standard %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1310,58 +1285,58 @@ msgstr "" "%s (%s) — %s sauvegardé [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Fermeture de la connexion à l’octet %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Erreur de lecture à l’octet %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Erreur de lecture à l’octet %s/%s (%s)." -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualité de protection « %s » non prise en charge.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algorithme « %s » non pris en charge.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s : WGETRC pointe vers %s qui n’existe pas.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s : impossible de lire %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s : erreur dans %s à la ligne %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s : erreur de syntaxe dans %s à la ligne %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s : commande inconnue %s dans %s à la ligne %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1373,7 +1348,7 @@ msgstr "" "« %s »,\n" "ou indiquer un autre fichier avec --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1384,49 +1359,49 @@ msgstr "" "« %s »,\n" "ou indiquer un autre fichier avec --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s : avertissement : le wgetrc du système et celui de l’utilisateur pointent " "vers %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s : commande --execute %s incorrecte\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s : %s : valeur logique %s incorrecte ; utilisez « on » ou « off ».\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s : %s : %s incorrecte ; utilisez « on » ou « off ».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s : %s : nombre %s incorrect.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s : %s ne peut être utilisée qu’une fois\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s : %s : valeur d’octet %s incorrecte\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s : %s : période de temps %s incorrecte\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1435,28 +1410,28 @@ msgstr "" "use-askpass nécessite une chaîne ou l’activation de l’une des deux variables " "WGET_ASKPASS ou SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s : %s : valeur %s incorrecte.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s : %s : en-tête %s incorrect.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s : %s : en-tête WARC %s incorrect.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s : %s : type de progression %s incorrect.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1465,40 +1440,40 @@ msgstr "" "%s : %s : restriction %s incorrecte,\n" " utilisez [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "L’encodage %s est incorrect\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "La conversion de %s vers %s n’est pas prise en charge\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Séquence multioctet incomplète ou incorrecte rencontrée\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Erreur %d (errno) non gérée\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8 : les paramètres régionaux ne sont pas définis\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "Échec d’idn_encode (%d) : %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "impossible de convertir en minuscules : %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1507,17 +1482,17 @@ msgstr "" "\n" "Redirection de la sortie vers %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s : %s ; désactivation de la journalisation.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Utilisation : %s [OPTION]… [URL]…\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1526,70 +1501,70 @@ msgstr "" "aussi pour les options au format court.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Démarrage :\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version afficher la version de Wget et quitter\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help afficher l’aide-mémoire\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background passer en arrière plan après le " "démarrage\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMANDE exécuter une commande de type « ." "wgetrc »\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Journalisation et fichier d’entrée :\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=FICHIER journaliser les messages dans le FICHIER\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FICHIER accoler les messages au FICHIER\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug afficher beaucoup d’informations de " "débogage\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug afficher la sortie de débogage Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" " -q, --quiet exécuter en mode silencieux (sans " "sortie)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose exécuter en mode bavard (mode par " "défaut)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1597,7 +1572,7 @@ msgstr "" " -nv, --no-verbose arrêter le mode bavard, sans être " "silencieux\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1606,7 +1581,7 @@ msgstr "" " TYPE peut être « bits » par " "exemple\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1614,7 +1589,7 @@ msgstr "" " -i, --input-file=FICHIER télécharger les URL du FICHIER local ou " "dist\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1622,14 +1597,14 @@ msgstr "" " --input-metalink=FICHIER télécharger les files couverts dans le " "FICHIER Metalink local\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html traiter le fichier d’entrée comme du " "HTML\n" # s/resolves/resolve/ -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1638,28 +1613,28 @@ msgstr "" "d’entrée\n" " (-i -F) en relatif par rapport à URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FICHIER FICHIER de configuration à utiliser\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config ne lire aucun fichier de configuration\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FICHIER journaliser les rejets d’URL dans le " "FICHIER\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Téléchargement :\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1667,19 +1642,19 @@ msgstr "" " -t, --tries=NOMBRE définir le NOMBRE de tentatives\n" " (0 indique l’absence de limite)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused réessayer même si la connexion est " "refusée\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" " -O, --output-document=FICHIER écrire les documents dans le FICHIER\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1688,7 +1663,7 @@ msgstr "" " déjà existants (qui auraient été " "écrasés)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1696,7 +1671,7 @@ msgid "" msgstr "" " --no-config ne lire aucun fichier de configuration\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1704,7 +1679,7 @@ msgstr "" " -c, --continue poursuivre le téléchargement d’un\n" " fichier incomplet\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1713,13 +1688,13 @@ msgstr "" "la\n" " POSITION commençant à zéro\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE sélectionner le TYPE de jauge de " "progression\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1728,7 +1703,7 @@ msgstr "" "soit\n" " le mode\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1738,7 +1713,7 @@ msgstr "" "s’ils\n" " sont plus récents que localement\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1748,7 +1723,7 @@ msgstr "" "conditionnelle if-modified-since\n" " en mode timestamping\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1757,21 +1732,21 @@ msgstr "" "à\n" " celle du serveur\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response afficher la réponse du serveur\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ne rien télécharger\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDE définir toutes les valeurs de délai " "d’attente\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1779,7 +1754,7 @@ msgstr "" " --dns-servers=ADDRESSES liste des serveurs DNS à contacter " "(séparée par des virgules)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1787,27 +1762,27 @@ msgstr "" " --bind-dns-address=ADRESSE lier le solveur DNS à l’ADRESSE (nom " "d’hôte ou adresse IP) de l’hôte local\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECONDE définir le délai d’attente de résolution " "DNS\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECONDE définir le délai d’attente de connexion\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECONDE définir le délai d’attente de lecture\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDE temps d’attente entre les essais\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1815,7 +1790,7 @@ msgstr "" " --waitretry=SECONDE temps d’attente maximal entre les essais\n" # NOTE: Long line -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1825,19 +1800,19 @@ msgstr "" " compris entre 0,5 et 1,5 du temps " "d’attente\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy désactiver le serveur mandataire " "(« proxy »)\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NOMBRE définir le quota de récupération à " "NOMBRE\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1845,17 +1820,17 @@ msgstr "" " --bind-address=ADRESSE lier localement (nom d’hôte ou adresse " "IP)\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=TAUX limiter le TAUX de téléchargement\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache désactiver la mise en cache de recherches " "DNS\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1863,7 +1838,7 @@ msgstr "" " --restrict-file-names=SE limiter caractères du système " "d’exploitation\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1872,17 +1847,17 @@ msgstr "" "des\n" " fichiers ou répertoires\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only ne se connecter qu’aux adresses IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only ne se connecter qu’aux adresses IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1893,22 +1868,22 @@ msgstr "" " FAMILLE : IPv6, IPv4 ou " "« none » (aucune)\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=IDENTIFIANT définir l’IDENTIFIANT pour FTP et HTTP\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=MOT_DE_PASSE définir le MOT_DE_PASSE pour FTP et HTTP\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password demander les mots de passe\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1926,31 +1901,31 @@ msgstr "" "WGET_ASKPASS \n" " ou the SSH_ASKPASS est used.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" " --no-iri désactiver la prise en charge des IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC utiliser l’encodage local ENC pour les " "IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC utiliser l’encodage distant ENC par " "défaut\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink supprimer le fichier avant de l’écraser\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1958,7 +1933,7 @@ msgstr "" " --keep-badhash conserve les fichiers de somme de " "contrôle qui ne correspondent pas (ajoute .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1966,7 +1941,7 @@ msgstr "" " --metalink-index=NOMBRE Metalink application/metalink4+xml " "metaurl NOMBRE\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1974,7 +1949,7 @@ msgstr "" " --metalink-over-http utiliser les métadonnées Metalink des " "entêtes de réoonse HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1982,7 +1957,7 @@ msgstr "" " --preferred-location localisation préférée des resources " "Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1990,60 +1965,60 @@ msgstr "" " --no-xattr désactiver le stockage des métadonnées " "dans les attributs de fichier étendus\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Répertoires :\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne pas créer de répertoires\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories forcer la création de répertoires\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories ne pas créer de répertoires sur l’hôte\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories utiliser des répertoires au nom du " "protocole\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=PRÉFIXE sauvegarder les fichiers dans PRÉFIXE/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=NOMBRE ignorer NOMBRE composants de répertoire\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Options HTTP :\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=IDENTIFIANT définir l’IDENTIFIANT HTTP\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=MDP définir le mot de passe HTTP\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache interdire données mises en cache du " "serveur\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2051,7 +2026,7 @@ msgstr "" " --default-page=NOM modifier le nom de la page par défaut\n" " (normalement « index.html »)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2060,19 +2035,19 @@ msgstr "" "avec\n" " leur extension\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorer le champ d’en-tête « Content-" "Length »\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=CHAÃŽNE insérer la CHAÃŽNE dans les en-têtes\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2081,26 +2056,26 @@ msgstr "" " --progress=TYPE sélectionner le TYPE de jauge de " "progression\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect nbre maxi de redirections autorisées par " "page\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=IDENTIFIANT définir l’IDENTIFIANT du serveur " "mandataire\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=MDP définir le mot de passe du serveur " "mandataire\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2108,13 +2083,13 @@ msgstr "" " --referer=URL inclure l’en-tête « Referer: URL » en " "requête\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers sauvegarder les en-têtes HTTP dans le " "fichier\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2122,31 +2097,31 @@ msgstr "" " -U, --user-agent=AGENT s’identifier comme AGENT et non Wget/" "VERSION\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" " --no-http-keep-alive désactiver les connexions persistantes\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne pas utiliser les cookies\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FICHIER charger les cookies du FICHIER avant " "session\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FICHIER sauvegarder cookies en FICHIER après " "session\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2155,7 +2130,7 @@ msgstr "" "session\n" " (non permanents)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2163,7 +2138,7 @@ msgstr "" " --post-data=CHAÃŽNE utiliser la méthode POST pour envoyer " "CHAÃŽNE\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2171,14 +2146,14 @@ msgstr "" " --post-file=FICHIER utiliser POST ; envoyer le contenu du " "FICHIER\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=MéthodeHTTP utiliser la « MéthodeHTTP » dans l’en-" "tête\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2186,7 +2161,7 @@ msgstr "" " --body-data=CHAÃŽNE envoyer la CHAÃŽNE comme données.\n" " --method doit être définie\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2194,7 +2169,7 @@ msgstr "" " --body-file=FICHIER envoyer le contenu du FICHIER.\n" " --method doit être définie\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2206,7 +2181,7 @@ msgstr "" " pour les noms de fichiers locaux " "(expérim.)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2214,7 +2189,7 @@ msgstr "" " --content-on-error afficher le contenu reçu après erreurs " "serveur\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2226,11 +2201,11 @@ msgstr "" " HTTP de base sans attendre d’abord la\n" " question du serveur\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Options HTTPS (SSL/TLS) :\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2241,41 +2216,41 @@ msgstr "" "auto,\n" " SSLv2, SSLv3, TLSv1 et PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only ne suivre que les liens HTTPS sécurisé\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ne pas valider le certificat du serveur\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FICHIER fichier de certificat client\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE type du certificat client, PEM ou DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FICHIER fichier de clef privée\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TYPE type de clef privée, PEM ou DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=FICHIER fichier des certificats d’autorités\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2285,13 +2260,13 @@ msgstr "" " certificats d’autorités de " "certification\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=FICHIER fichier de liste de révocations de " "certificat\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2308,7 +2283,7 @@ msgstr "" "vérification\n" " les paires\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2318,7 +2293,7 @@ msgstr "" " génération de nombres pseudoaléatoires " "SSL\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2326,15 +2301,15 @@ msgstr "" " --egd-file=FICHIER fichier de socket EGD avec données " "aléatoires\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Options HSTS :\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts désactiver HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2342,11 +2317,11 @@ msgstr "" " --hsts-file chemin de la base de données HSTS " "(écrasera l’existant)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Options FTP :\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2355,38 +2330,38 @@ msgstr "" "les\n" " fichiers binaires FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=IDENTIFIANT définir l’IDENTIFIANT FTP\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=MDP définir le mot de passe FTP\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing ne pas enlever les fichiers « .listing »\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob désactiver développement de noms de " "fichiers\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp désactiver le mode de transfert passif\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions préserver les droits des fichiers " "distants\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2395,11 +2370,11 @@ msgstr "" " attachés aux liens (pas les " "répertoires)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Options FTPS :\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2407,7 +2382,7 @@ msgstr "" " --ftps-implicit utiliser implicitement FTPS (port par " "défaut 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2418,7 +2393,7 @@ msgstr "" " lorsque la connexion de données est " "ouverte\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2426,7 +2401,7 @@ msgstr "" " --ftps-clear-data-connection chiffrer le canal de contrôle " "uniquement ; Toutes les données seront en clair\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2434,11 +2409,11 @@ msgstr "" " --ftps-fallback-to-ftp revenir en FTP si FTPS n’est pas pris " "en charge dans le serveur cible\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "options WARC :\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2447,25 +2422,25 @@ msgstr "" "réponse\n" " dans un fichier .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=CHAÃŽNE insérer CHAÃŽNE dans l’enregistrement " "warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NOMBRE définir la taille maximal de fichiers " "WARC\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx écrire les fichiers d’index CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2473,18 +2448,18 @@ msgstr "" " --warc-dedup=FICHIER ne pas garder enregistrements du fichier " "CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ne pas compresser les fichiers WARC avec " "gzip\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ne pas calculer les hachages SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2492,7 +2467,7 @@ msgstr "" " --no-warc-keep-log ne pas garder journal en enregistrement " "WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2502,16 +2477,16 @@ msgstr "" "créés\n" " par l’écriture WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Téléchargement récursif :\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive activer les téléchargements récursifs\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2519,7 +2494,7 @@ msgstr "" " -l, --level=NOMBRE niveau de récursion maximal\n" " (inf ou 0 pour infini)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2527,7 +2502,7 @@ msgstr "" " --delete-after détruire fichiers locaux après " "téléchargement\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2536,7 +2511,7 @@ msgstr "" " -k, --convert-links transformer les liens en local dans les\n" " fichiers HTML et CSS téléchargés\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2544,7 +2519,7 @@ msgstr "" " --convert-file-only convertie seulement la partie fichier de " "l’URL (courant appelé basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2553,7 +2528,7 @@ msgstr "" "un\n" " exemplaire, et en garder au plus N\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2561,7 +2536,7 @@ msgstr "" " -K, --backup-converted sauver fichier X en X_orig avant " "conversion\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2569,7 +2544,7 @@ msgstr "" " -K, --backup-converted sauver fichier X en X.orig avant " "conversion\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2577,7 +2552,7 @@ msgstr "" " -m, --mirror raccourci de -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2586,7 +2561,7 @@ msgstr "" "nécessaires\n" " pour afficher la page HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2594,11 +2569,11 @@ msgstr "" " --strict-comments activer le traitement strict (SGML) des\n" " commentaires HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Acceptation ou rejet récursif :\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2607,7 +2582,7 @@ msgstr "" "par\n" " des virgules\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2616,50 +2591,50 @@ msgstr "" "par\n" " des virgules\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=EXPR_R expression rationnelle correspondant aux\n" " URL acceptées\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=EXPR_R expression rationnelle correspondant aux\n" " URL rejetées\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYPE type d’expression rationnelle (posix|" "pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE type d’expression rationnelle (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTE domaines acceptés, séparés par des " "virgules\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTE domaines rejetés, séparés par des " "virgules\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp suivre les liens FTP des documents HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2668,7 +2643,7 @@ msgstr "" "par\n" " des virgules\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2677,21 +2652,21 @@ msgstr "" "par\n" " des virgules\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts suivre les liens externes en mode " "récursif\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative ne suivre que les liens relatifs\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE liste des répertoires permis\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2701,88 +2676,88 @@ msgstr "" "de\n" " l’URL de redirection\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTE liste des répertoires exclus\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent ne pas remonter dans le répertoire " "parent\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Veuillez signaler toutes anomalies ou suggestions à \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, un récupérateur réseau non interactif.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Mot de passe pour l’utilisateur %s : " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Mot de passe : " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "impossible de créer le tube\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Erreur lors de l’initialisation des actions de fichier spawn pour use-" "askpass : %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Erreur lors de la configuration des actions de fichier pour use-askpass : " "%d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Erreur de lecture de la réponse pour la commande « %s %s » : %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Login pour « %s%s » : " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Mot de passe pour l’utilisateur « %s%s@%s » : " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc : " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Paramètres régionaux : " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Compilation : " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Lien : " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2791,29 +2766,29 @@ msgstr "" "GNU Wget %s compilé sur %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (environnement)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (utilisateur)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (système)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2827,7 +2802,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2835,36 +2810,36 @@ msgstr "" "\n" "Écrit initialement par Hrvoje NikÅ¡ić .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Veuillez signaler toutes anomalies ou demandes à .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problème d’allocation de mémoire\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Une erreur dans %s force à quitter\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Utilisez « %s --help » pour obtenir plus de renseignements.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s : option incorrecte — « -n%c »\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Débogage non activé lors de la compilation. Attribut --debug ignoré.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2873,7 +2848,7 @@ msgstr "" "--no-clobber et --convert-links ont toutes deux été indiquées, seule --" "convert-links sera utilisée.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2882,24 +2857,24 @@ msgstr "" "--no-clobber et --convert-file-only ont toutes deux été indiquées, seule --" "convert-links-only sera utilisée.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Impossible d’être en mode bavard et silencieux en même temps.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Impossible d’utiliser les dates sans écraser les vieux fichiers en même " "temps.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Impossible d’indiquer --inet4-only et --inet6-only ensemble.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2911,7 +2886,7 @@ msgstr "" "combinaison avec -p ou -r. Consultez le manuel pour plus de précisions.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2922,7 +2897,7 @@ msgstr "" "sera placé dans le fichier unique indiqué.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2933,12 +2908,7 @@ msgstr "" "pour plus de précisions.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Fichier « %s » déjà présent ; pas de récupération.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2946,7 +2916,7 @@ msgstr "" "La sortie WARC ne fonctionne pas avec --no-clobber, qui sera donc " "désactivée.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2954,12 +2924,12 @@ msgstr "" "La sortie WARC ne fonctionne pas avec l’horodatage, qui sera donc " "désactivé.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "La sortie WARC ne fonctionne pas avec --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2968,7 +2938,7 @@ msgstr "" "La sortie WARC ne fonctionne pas avec --continue ou --start-pos, qui seront " "donc désactivées.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2976,7 +2946,7 @@ msgstr "" "Les hachages sont désactivés ; la déduplication WARC ne trouvera pas les " "enregistrements en double.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2985,12 +2955,12 @@ msgstr "" "La sortie WARC ne fonctionne pas avec --continue ou --start-pos, qui seront " "donc désactivées.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Impossible d’indiquer --ask-password et --password ensemble.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2999,17 +2969,17 @@ msgstr "" "Indiquer à la fois --start-pos et --continue est déconseillé ; --continue " "sera désactivée.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s : URL manquante\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Vous ne pouvez pas indiquer --post-data et --post-file ensemble.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3018,7 +2988,7 @@ msgstr "" "Vous ne pouvez pas utiliser --post-data ou --post-file avec --method. --" "method attend des données avec les options --body-data et --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3027,17 +2997,17 @@ msgstr "" "Une méthode doit être indiquée à l’aide de --method=MéthodeHTTP pour " "utiliser avec --body-data ou --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Vous ne pouvez pas indiquer --body-data et --body-file ensemble.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Cette version ne prend pas en charge les IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3045,7 +3015,7 @@ msgstr "" "-k ou -r ne peuvent être utilisées avec -O qu’en cas de sortie dans un " "fichier ordinaire.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3054,42 +3024,42 @@ msgstr "" "--convert-links ou --convert-file-only ne peuvent être utilisées ensemble " "qu’en cas de sortie dans un fichier ordinaire.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Impossible d’initialiser libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Échec de l’initialisation du canal c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Lecture de l’adresse IP « %s » échouée\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Échec de l’affectation du serveur DNS « %s » : (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Aucune URL repérée dans %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Impossible de parser le fichier metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Impossible de télécharger toutes les resources depuis %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3100,7 +3070,7 @@ msgstr "" "Temps total effectif : %s\n" "Téléchargés : %d fichiers, %s en %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota de téléchargement %s dépassé.\n" @@ -3260,111 +3230,111 @@ msgstr "Fichier %s récupéré mais sa signature ne correspnod pas.\n" msgid "Renaming %s to %s.\n" msgstr "Renommage de %s en %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Poursuite en arrière plan.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Poursuite en arrière plan, PID %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "La sortie sera écrite vers %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "Échec de fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "Échec de fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s : aucune socket de pilote utilisable.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Échec de ioctl(). La socket n’a pas pu être définie comme bloquante.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s : %s:%d : avertissement : le jeton %s apparaît devant le nom de machine\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s : %s:%d : jeton « %s » inconnu\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Utilisation : %s NETRC [HÔTE]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s : impossible d’obtenir l’état de %s : %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "Attention : utilisation d’une initialisation aléatoire faible.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Impossible d’initialiser la génération de nombres pseudoaléatoires ; " "considérer l’utilisation de --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" "La version d’OpenSSL est trop ancienne pour prendre en charge TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" "La version d’OpenSSL est trop ancienne pour prendre en charge TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" "OpenSSL : valeur %d pour l’option « secure-protocol » non prise en charge\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" "%s : impossible de vérifier l’attribut %s du certificat, émis par %s :\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Impossible de vérifier localement l’autorité de l’émetteur.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Récupération d’un certificat autosigné.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Le certificat émis n’est pas encore valable.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Le certificat émis a expiré.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3373,7 +3343,7 @@ msgstr "" "%s : le nom de sujet alternatif du certificat ne correspond pas au\n" "\tnom d’hôte %s demandé.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3381,7 +3351,7 @@ msgstr "" " %s : le nom commun du certificat %s ne correspond pas au nom d’hôte %s " "demandé.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3392,14 +3362,14 @@ msgstr "" " NULL). Cela peut indiquer une usurpation d’hôte (c’est-à-dire qu’il ne\n" " s’agit pas du véritable %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Pour établir une connexion non sécurisée à %s, utilisez « --no-check-" "certificate ».\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3408,7 +3378,7 @@ msgstr "" "\n" "%*s[ %sK ignoré ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3416,23 +3386,23 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " tps %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " ds " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" "Impossible d’obtenir la fréquence de l’horloge en temps réel (REALTIME) : " "%s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Suppression de %s puisqu’il devrait être rejeté.\n" @@ -3446,23 +3416,23 @@ msgstr "Impossible d’ouvrir %s : %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Chargement de robots.txt ; veuillez ignorer les erreurs.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erreur d’analyse de l’URL du serveur mandataire (« proxy ») %s : %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" "Erreur d’URL de serveur mandataire (« proxy ») %s : doit être de type HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections dépassant la limite permise.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3470,7 +3440,7 @@ msgstr "" "Abandon.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3478,125 +3448,125 @@ msgstr "" "Nouvel essai.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Aucune erreur" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Schéma %s non pris en charge" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schéma manquant" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Nom d’hôte incorrect" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Mauvais numéro de port" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Identifiant incorrect" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Adresse numérique IPv6 non terminée" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Adresses IPv6 non prises en charge" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Adresse numérique IPv6 incorrecte" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS non activé lors de la compilation." -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Séquence multioctet incomplète ou incorrecte rencontrée\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s : %s : échec d’allocation de mémoire ; mémoire épuisée.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s : %s : échec d’allocation de %ld octets ; mémoire épuisée.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s : aprintf : tampon de texte trop grand (%d octets), abandon.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Poursuite en arrière plan, PID %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Impossible de supprimer le lien symbolique %s : %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Impossible d’initialiser libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Impossible de définir les permissions pour %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Impossible de définir les permissions pour %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Lecture de l’adresse IP « %s » échouée\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Impossible de définir les permissions pour %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expression rationnelle %s incorrecte, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Erreur de correspondance de %s : %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3686,6 +3656,24 @@ msgstr "" "Correspondance exacte trouvée dans le fichier CDX. Sauvegarde de " "l’enregistrement revisité dans WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s : l’option « --%s » n’accepte pas d’argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s : l’option « --%s » n’est pas reconnue\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s : l’option « -W %s » est ambiguë\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s : l’option « -W %s » n’accepte pas d’argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s : l’option « -W %s » nécessite un argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Fichier « %s » déjà présent ; pas de récupération.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/ga.gmo b/po/ga.gmo index c2e5384..b97f009 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index f5fab65..f0b23ab 100644 --- a/po/ga.po +++ b/po/ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-17 11:59-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :" "(n>6 && n<11) ? 3 : 4;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Earráid chórais anaithnid" @@ -26,7 +26,7 @@ msgstr "Earráid chórais anaithnid" msgid "Address family for hostname not supported" msgstr "Ní thacaítear leis an bhfine seoltaí" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Teip shealadach ar réiteach na n-ainmneacha" @@ -94,70 +94,45 @@ msgstr "Briseadh comhartha isteach air" msgid "Parameter string not correctly encoded" msgstr "Ní raibh an teaghrán paraiméadar ionchódaithe mar is ceart" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Earráid anaithnid" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Tá an rogha '%s' débhríoch; féidearthachtaí:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Tá an rogha '%s' débhríoch\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '--%s'\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: Tá an rogha '%s' débhríoch; féidearthachtaí:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: rogha anaithnid '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '%c%s'\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '--%s'\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: rogha anaithnid '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: rogha anaithnid '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhailí -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Tá an rogha '-W %s' débhríoch\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '-W %s'\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '-W %s'\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -177,13 +152,13 @@ msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '-W %s'\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -255,28 +230,28 @@ msgstr "Slonn ionadaíochta rómhór" msgid "Unmatched ) or \\)" msgstr ") nó \\) corr" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Ní raibh slonn ionadaíochta ann roimhe seo" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "ní féidir píopa a chruthú" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "theip ar fhophróiseas %s" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "theip ar _open_osfhandle" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "ní féidir fd %d a athchóiriú: theip ar dup2" @@ -295,51 +270,51 @@ msgstr "Fuair fophróiseas %s comhartha marfach %d" msgid "memory exhausted" msgstr "cuimhne ídithe" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: ní féidir seoladh ceangail %s a réiteach; ceangal á dhíchumasú.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Ag dul i dteagmháil le %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Ag dul i dteagmháil le %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Ag dul i dteagmháil le [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "theip ar setsockopt SO_RCVBUF: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "ceangailte.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "teipthe: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ní féidir seoladh an óstríomhaire %s a réiteach\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "theip ar setsockopt SO_REUSEADDR: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "An iomarca fd-anna oscailte. Ní féidir select a úsáid ar fd >= %d\n" @@ -373,178 +348,178 @@ msgstr "Ní féidir %s a scriosadh: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ní féidir cúltaca a dhéanamh ar %s mar %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Ní féidir fianán a fháil le haghaidh %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Earráid chomhréire i Set-Cookie: %s ag %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Rinne fianán ó %s iarracht ar an bhfearann a athrú go " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ní féidir comhad na bhfianán %s a oscailt: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Earráid le linn scríofa i gcomhad %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Earráid agus %s á dhúnadh: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Modh liostála gan tacaíocht, ag baint triail as parsálaí liostála Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Innéacs de /%s ar %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "am anaithnid " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Comhad " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Comhadlann " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Nasc " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Éiginnte " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s beart)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Fad: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) fágtha" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s fágtha" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (neamhúdarásach)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Níorbh fhéidir SSL a thúsú. Díchumasófar é." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Logáil isteach mar %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Earráid sa fhreagra ón fhreastalaí, ceangal rialaithe á dhúnadh.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Earráid i mbeannacht ón fhreastalaí.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Theip ar scríobh, ceangal rialaithe á dhúnadh.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Ní cheadaíonn an freastalaí do logáil isteach.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Logáil mhícheart.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Logáilte isteach!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Níor ghlac an freastalaí leis an ordú 'PBSZ 0'.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Níor ghlac an freastalaí leis an ordú 'PROT %c'.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Earráid fhreastalaí, ní féidir an cineál córais a dhéanamh amach.\n" # used in the stats page table -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "críochnaithe. " # used in the stats page table -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "críochnaithe.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Cineál anaithnid `%c', ceangal rialaithe á dhúnadh.\n" # used in the stats page table -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "críochnaithe." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> Níl gá le CWD.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Sroicheadh rannán doshroichte in getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -555,7 +530,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -564,37 +539,37 @@ msgstr "" "Níl comhadlann %s ann.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> Níl CWD de dhíth.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Fuarthas an comhad cheana.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ní féidir tús a chur leis an aistriú PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ní féidir an freagra PASV a pharsáil.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "níorbh fhéidir dul i dteagmháil le %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Earráid cheangail (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT neamhbhailí.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -602,17 +577,17 @@ msgstr "" "\n" "Theip ar REST, ag atosú ó thosach.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Tá comhad %s ann.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Níl comhad %s ann.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -621,7 +596,7 @@ msgstr "" "Níl comhad %s ann.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -630,41 +605,41 @@ msgstr "" "Níl a leithéid de chomhad ná de chomhadlann ann: %s\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "Tá %s ann anois.\n" # CRL next update. -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, ceangal rialaithe á dhúnadh.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Ceangal sonraí: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Ceangal rialaithe dúnta.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Tobscoireadh an t-aistriú sonraí.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Tá comhad %s ann cheana; ní aisghabhfar é.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(iarracht:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -673,7 +648,7 @@ msgstr "" "%s (%s) - scríofa ar stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -682,35 +657,35 @@ msgstr "" "%s (%s) - %s sábháilte [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "%s á bhaint.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "%s á úsáid mar chomhad sealadach le haghaidh liostála.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Baineadh %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Doimhneacht athchúrsála %d níos mó ná an t-uasmhéid %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Níl an comhad i gcéin níos nuaí ná an comhad áitiúil %s -- ní aisghabhfar " "é.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -719,7 +694,7 @@ msgstr "" "Tá an comhad i gcéin níos nuaí ná an comhad áitiúil %s -- á aisghabháil.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -728,11 +703,11 @@ msgstr "" "Níl an méid céanna ar na comhaid (áitiúil %s) -- á aisghabh.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ainm neamhbhailí ar an nasc siombalach, ag dul thart.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -741,241 +716,241 @@ msgstr "" "Tá nasc ceart siombalach ann cheana %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Nasc siombalach %s -> %s á chruthú\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Ní thacaítear le nascanna siombalacha, ag dul thar %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ag dul thar comhadlann %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: comhad de chineál anaithnid/gan tacaíocht.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Níorbh fhéidir ceadanna le haghaidh %s a shocrú.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: stampa ama truaillithe.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Ní aisghabhfar comhadlanna toisc gurb é %d an doimhneacht (uasmhéid %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ní rachfar isteach i %s toisc go bhfuil eisiata/as an áireamh.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s á dhiúltú.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Earráid agus %s á chur i gcomhoiriúnacht do %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Níl aon rud comhoiriúnach leis an bpatrún %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Scríobhadh innéacs i bhformáid HTML i %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Scríobhadh innéacs i bhformáid HTML i %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "EARRÃID: Ní féidir comhadlann %s a oscailt.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "EARRÃID: Níorbh fhéidir teastas %s a oscailt: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Teastas CA '%s' lódáilte\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "EARRÃID: Níorbh fhéidir comhad CRL '%s' a lódáil: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Lódáladh comhad CRL '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "EARRÃID: Éilíonn GnuTLS gur den chineál céanna iad an eochair agus an " "teastas.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: níl an luach %d ar fáil le 'secure-protocal'\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Seol tuairisc faoin fhabht seo chuig bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: níl an luach %d ar fáil le 'secure-protocal'\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "EARRÃID" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "RABHADH" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Níor thaispeáin %s teastas ar bith.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Níl an teastas ag %s iontaofa.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Níl eisitheoir aitheanta ag teastas %s.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Aisghaireadh an teastas ag %s.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Ní CA é sínitheoir an teastais ag %s.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Síníodh teastas %s le halgartam neamhshlán.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Níl an teastas ag %s bailí fós.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Chuaigh an teastas ag %s as feidhm.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Earráid agus teastas X509 á thúsú: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Níor aimsíodh aon teastas\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Earráid agus an teastas á pharsáil: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Níl an teastas bailí fós.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Chuaigh an teastas as feidhm\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Ní ionann úinéir an teastais agus an t-óstainm %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Ní ionann an eochair phoiblí agus an eochair a bhfuil PIN aici!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Caithfear teastas X.509 a úsáid\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Earráid agus an liosta seoltaí á láimhseáil.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Óstríomhaire anaithnid" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "%s á réiteach... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "teipthe: Gan seoladh IPv4/IPv6 don óstríomhaire.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "teipthe: thar am.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ní féidir nasc %s neamhiomlán a réiteach.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL neamhbhailí %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Theip ar scríobh iarratais HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Gan cheanntásca, glac le HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -984,11 +959,11 @@ msgstr "" "Tá an comhad %s ann cheana; ní aisghabhfar é.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "theip ar gmtime. Is dócha gur fabht é seo.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -996,55 +971,55 @@ msgstr "" "Ní féidir an stampa ama a thiontú go HTTP. Úsáidfear am athraithe = 0 mar " "chúltaca.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Comhad sonraí BODY %s ar iarraidh: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ag baint athúsáid as an gceangal le [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ag baint athúsáid as an gceangal le %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Theip ar léamh freagra ón seachfhreastalaí: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s EARRÃID %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Líne stádais míchumtha" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Theip ar thollánú seachfhreastalaí: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Scéim anaithnid fhíordheimhnithe.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Scéim fhíordheimhnithe: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "à shábháil i: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1053,21 +1028,21 @@ msgstr "" "Agus síniú á íoslódáil:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ní féidir ábhar an tsínithe a léamh ó chomhad sealadach. Ag dul thart.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Níorbh fhéidir comhad sealadach a chruthú. Ní íoslódálfar an síniú.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Luach neamhbhailí pri. Glacfar le %d ina ionad.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1075,42 +1050,42 @@ msgstr "" "Níor aimsíodh achoimre inghlactha le haghaidh acmhainní Metalink.\n" "Déanfar neamhshuim orthu.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL á dhíchumasú de bharr earráidí.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Iarratas %s seolta, ag fanacht le freagra... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Níor glacadh aon sonra.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Earráid (%s) ag léamh na gceanntásc.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(gan cur síos)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Suíomh: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "gan sonrú" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [á leanúint]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1119,7 +1094,7 @@ msgstr "" "Níor athraigh comhad %s ar an bhfreastalaí. Ní íoslódálfar é.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1131,7 +1106,7 @@ msgstr "" "Seans gur mhaith leat an rogha --no-if-modified-since a shonrú.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1141,58 +1116,58 @@ msgstr "" " Bhí an comhad aisghafa ina iomláine cheana; níl faic le déanamh.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Fad: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "rinneadh neamhaird" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Rabhadh: níl saoróga ar fáil i HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Cumasaíodh an mód crúbadáin. Seiceáil an bhfuil an cianchomhad ann.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ní féidir scríobh i gcomhad %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Fuarthas aitreabúid riachtanach a bhí ar iarraidh ón Cheanntásc.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Theip ar fhíordheimhniú Ainm Úsáideora/Focal Faire.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ní féidir scríobh sa chomhad WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ní féidir scríobh i gcomhad sealadach WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ní féidir ceangal SSL a dhéanamh.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ní féidir %s a dhínascadh (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EARRÃID: Atreorú (%d) gan suíomh.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1200,24 +1175,24 @@ msgstr "" "Níor aimsíodh na sonraí Metalink sa fhreagra HTTP. Comhad á íoslódáil trí " "HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Aimsíodh na ceanntásca Metalink. Bainfear úsáid as an mód Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Níl an cianchomhad ann -- nasc briste!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Ceanntásc `Last-modified' ar iarraidh -- ní úsáidfear stampaí ama.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Ceanntásc neamhbhailí `Last-modified' -- tugadh neamhaird ar an stampa ama.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1227,16 +1202,16 @@ msgstr "" "aisghabhfar é.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Níl an méid céanna ar na comhaid (áitiúil %s) -- á aisghabh.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Tá an cianchomhad níos nuaí, á aisghabháil.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1246,7 +1221,7 @@ msgstr "" "-- á aisghabháil.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1254,7 +1229,7 @@ msgstr "" "Tá an cianchomhad ann ach níl aon nasc ann -- ní aisghabhfar é.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1264,7 +1239,7 @@ msgstr "" "ach díchumasaíodh athchúrsáil -- ní aisghabhfar é.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1272,12 +1247,12 @@ msgstr "" "Tá an cianchomhad ann.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "URL %s: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1286,7 +1261,7 @@ msgstr "" "%s (%s) - scríofa ar stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1295,58 +1270,58 @@ msgstr "" "%s (%s) - %s sábháilte [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Ceangal dúnta ag beart %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Earráid léimh ag beart %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Earráid léimh ag beart %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Cáilíocht cosanta nach dtacaítear léi '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algartam gan tacaíocht '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: Tá WGETRC dírithe ar %s, agus níl sé seo ann ar chor ar bith.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ní féidir %s a léamh (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Earráid i %s, líne %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Earráid chomhréire i %s ag líne %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ordú anaithnid %s i %s ag líne %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1356,7 +1331,7 @@ msgstr "" "Níorbh fhéidir comhad wgetrc an chórais a pharsáil (cf athróg\n" "SYSTEM_WGETRC). Féach '%s', nó roghnaigh comhad eile le --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1366,49 +1341,49 @@ msgstr "" "Níorbh fhéidir comhad wgetrc an chórais a pharsáil Féach '%s',\n" "nó roghnaigh comhad eile le --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Rabhadh: Tá na comhaid wgetrc ag an úsáideoir agus ag an gcóras nasctha " "le %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ordú neamhbhailí --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Slonn neamhbhailí Boole %s; úsáid `on' nó `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: %s neamhbhailí; úsáid `on', `off', nó `quiet'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Uimhir neamhbhailí %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: Ní féidir %s a úsáid níos mó ná uair amháin\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Luach neamhbhailí birt %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Tréimhse neamhbhailí %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1417,28 +1392,28 @@ msgstr "" "ní mór duit teaghrán a thabhairt do use-askpass, nó athróg timpeallachta " "WGET_ASKPASS nó SSH_ASKPASS a shocrú.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Luach neamhbhailí %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ceanntásc neamhbhailí %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ceanntásc WARC neamhbhailí %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Cineál neamhbhailí dul chun cinn %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1447,40 +1422,40 @@ msgstr "" "%s: %s: Teorannú neamhbhailí %s,\n" " úsáid [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Níl an t-ionchódú %s bailí\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Ní thacaítear le tiontú ó %s go %s\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Chonacthas seicheamh ilbheart neamhiomlán nó neamhbhailí\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Earráid %d gan láimhseáil\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: níl logchaighdeán sonraithe\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "theip ar idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Níorbh fhéidir tiontú go cás íochtair: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1489,17 +1464,17 @@ msgstr "" "\n" "Aschur á athsheoladh go %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logáil á díchumasú.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Úsáid: %s [ROGHA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1508,64 +1483,64 @@ msgstr "" "fhada.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Tosú:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version taispeáin an leagan de Wget agus scoir\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help taispeáin an chabhair seo\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background rith sa chúlra tar éis tosaithe\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=ORDÚ rith ordú de nós `.wgetrc'\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Logáil agus an t-inchomhad:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=COMHAD logáil teachtaireachtaí i gCOMHAD\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" " -a, --append-output=COMHAD iarcheangail teachtaireachtaí le COMHAD\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug taispeáin go leor eolas dhífhabhtaithe\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug taispeáin eolas dhífhabhtaithe Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tostach (gan aschur)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose foclach (seo é an réamhshocrú)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose idir foclach agus tostach\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1573,7 +1548,7 @@ msgstr "" " --report-speed=MODH taispeáin bandaleithead mar MODH, mar shampla " "'bots'\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1581,7 +1556,7 @@ msgstr "" " -i, --input-file=COMHAD íoslódáil URLanna ón CHOMHAD áitiúil nó " "seachtrach\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1589,11 +1564,11 @@ msgstr "" " --input-metalink=COMHAD íoslódáil comhaid clúdaithe sa CHOMHAD " "áitiúil Metalink\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html caith leis an inchomhad mar HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1602,42 +1577,42 @@ msgstr "" "F)\n" " i gcoibhneas le URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=COMHAD sonraigh comhad cumraíochta\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config ná léigh aon chomhad cumraíochta\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=COMHAD logchomhad i gcomhair URLanna diúltaithe\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Ãoslódáil:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=UIMHIR líon na n-atrialacha (0=gan teorainn)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused atriail fiú má tá an ceangal diúltaithe\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=COMHAD scríobh cáipéisí i gCOMHAD\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1645,20 +1620,20 @@ msgstr "" " -nc, --no-clobber ná híoslódáil comhad a d'fhorscríobhfadh\n" " comhad atá ann cheana\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config ná léigh aon chomhad cumraíochta\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue atosaigh íoslódáil comhad\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1666,11 +1641,11 @@ msgstr "" " --start-pos=UIMHIR tosaigh ag íoslódáil ó fhritháireamh " "UIMHIR\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=CINEÃL cineál rianaire dul chun cinn\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1678,7 +1653,7 @@ msgstr "" " --show-progress taispeáin barra dul chun cinn, mód " "foclachais ar bith\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1687,7 +1662,7 @@ msgstr "" " -N, --timestamping ná híoslódáil comhad mura bhfuil sé níos\n" " nuaí ná an leagan áitiúil\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1697,7 +1672,7 @@ msgstr "" "modified-since\n" " i mód na stampaí ama\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1706,20 +1681,20 @@ msgstr "" "bhfreastalaí\n" " chun an stampa ama áitiúil a shocrú\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response taispeáin an freagra ón fhreastalaí\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ná híoslódáil rud ar bith\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SOICINDà socraigh gach tréimhse feithimh = SOICINDÃ\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1727,7 +1702,7 @@ msgstr "" " --dns-servers=SEOLTAà liosta freastalaithe DNS le húsáid (camóga " "eatarthu)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1735,29 +1710,29 @@ msgstr "" " --bind-dns-address=SEOLADH ceangail réiteoir DNS le SEOLADH " "(óstainm/IP) ar an óstríomhaire áitiúil\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SOIC seal fanachta DNS = SOIC\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SOIC seal fanachta ceangailte = SOIC\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SOIC seal fanachta léimh = SOIC\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SOICINDà fan SOICINDà idir íoslódálacha\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " --waitretry=SOICINDà fan 1...SOICINDà idir atrialacha\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1765,15 +1740,15 @@ msgstr "" " --random-wait fan ó 0.5*WAIT...1.5*WAIT soicind idir " "íoslódálacha\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ná húsáid seachfhreastalaí\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=UIMHIR socraigh cuóta íoslódála\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1781,15 +1756,15 @@ msgstr "" " --bind-address=SEOLADH ceangail le SEOLADH (óstainm/IP) ar an " "óstach áitiúil\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RÃTA socraigh uasráta íoslódála\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache ná cuir cuardaigh DNS i dtaisce\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1797,7 +1772,7 @@ msgstr "" " --restrict-file-names=OS ná húsáid carachtair nach dtacaítear leo ar " "an OS\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1805,15 +1780,15 @@ msgstr "" " --ignore-case ná bac le cás agus comhaid/comhadlanna á " "meaitseáil\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only ceangail le seoltaí IPv4 amháin\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only ceangail le seoltaí IPv6 amháin\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1822,22 +1797,22 @@ msgstr "" " --prefer-family=CLANN ceangail ar dtús le seoltaí ón CHLANN,\n" " IPv6, IPv4, nó \"none\".\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ÚSÃIDEOIR socraigh an tÚSÃIDEOIR ftp agus http\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=FF socraigh an focal faire ftp agus http\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password faigh focail fhaire ón úsáideoir\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1854,29 +1829,29 @@ msgstr "" "WGET_ASKPASS\n" " nó SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri múch tacaíocht do IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=IONCHÓDÚ sonraigh IONCHÓDÚ áitiúil i gcomhair " "IRIanna\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=IONCHÓDÚ IONCHÓDÚ réamhshocraithe ar chomhaid i " "gcéin\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink scrios comhaid sula bhforscríobhfar iad\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1884,7 +1859,7 @@ msgstr "" " --keep-badhash coinnigh comhaid fiú mura meaitseálann an " "tsuim sheiceála (agus cuir .badhash leis an ainm)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1892,7 +1867,7 @@ msgstr "" " --metalink-index=UIMHIR Orduimhir Metalink application/" "metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1900,7 +1875,7 @@ msgstr "" " --metalink-over-http úsáid meiteashonraí Metalink ó " "cheanntásca an fhreagra HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1908,7 +1883,7 @@ msgstr "" " --preferred-location do rogha áite le haghaidh acmhainní " "Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1916,32 +1891,32 @@ msgstr "" " --no-xattr ná stóráil meiteashonraí in aitreabúidí " "breisithe\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Comhadlanna:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ná cruthaigh comhadlanna\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories cruthaigh comhadlanna i gcónaí\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ná cruthaigh comhadlanna óstacha\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories úsáid ainm an phrótacail i gcomhadlanna\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=RÉIMÃR sábháil comhaid i RÉIMÃR/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1949,25 +1924,25 @@ msgstr "" " --cut-dirs=UIMHIR déan neamhshuim ar UIMHIR comhpháirt den " "chomhadlann i gcéin\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Roghanna HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=ÚSÃIDEOIR socraigh an tÚSÃIDEOIR http\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=FF socraigh an focal faire http\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache ná ceadaigh sonraí curtha i dtaisce ag an " "bhfreastalaí\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1976,7 +1951,7 @@ msgstr "" "réamhshocraithe\n" " ('index.html' de ghnáth.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1984,40 +1959,40 @@ msgstr "" " -E, --adjust-extension sábháil cáipéisí HTML/CSS le hiarmhíreanna " "cuí\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length déan neamhaird den réimse 'Content-Length'\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=TEAGHRÃN cuir TEAGHRÃN sna ceanntásca\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=CINEÃL cineál rianaire dul chun cinn\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect uasmhéid atreoraithe do gach leathanach\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ÚSÃIDEOIR socraigh ÚSÃIDEOIR an tseachfhreastalaí\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=FF socraigh focal faire don seachfhreastalaí\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2025,11 +2000,11 @@ msgstr "" " --referer=URL cuir ceanntásc 'Referer: URL' san iarracht " "HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers sábháil na ceanntásca HTTP i gcomhad\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2037,7 +2012,7 @@ msgstr "" " -U, --user-agent=AINM tú féin a chur in aithne mar AINM vs. Wget/" "LEAGAN\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2045,23 +2020,23 @@ msgstr "" " --no-http-keep-alive díchumasaigh keep-alive HTTP (ceangail " "sheasmhacha)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ná húsáid fianáin\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=COMHAD lódáil fianáin ó CHOMHAD roimh an seisiún\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=COMHAD sábháil fianáin i gCOMHAD tar éis an " "tseisiúin\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2069,7 +2044,7 @@ msgstr "" " --keep-session-cookies lódáil agus sábháil fianáin (sealadacha) an " "tseisiúin\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2077,20 +2052,20 @@ msgstr "" " --post-data=TEAGHRÃN úsáid an modh POST; seol TEAGHRÃN mar na " "sonraí\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=COMHAD úsáid an modh POST; seol na sonraí as COMHAD\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod úsáid modh \"HTTPMethod\" san iarratas\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2098,7 +2073,7 @@ msgstr "" " --body-data=TEAGHRÃN seol TEAGHRÃN mar na sonraí; ní mór --method " "a shonrú\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2106,7 +2081,7 @@ msgstr "" " --body-file=COMHAD seol ábhar an CHOMHAID; ní mór --method a " "shonrú\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2116,7 +2091,7 @@ msgstr "" " --content-disposition géill do cheanntásc Content-Disposition agus\n" " ainmneacha áitiúla á roghnú (TURGNAMH)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2124,7 +2099,7 @@ msgstr "" " --content-on-error taispeáin an t-aschur a fuarthas i gcás " "earráide\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2134,11 +2109,11 @@ msgstr "" " --auth-no-challenge Seol bunfhaisnéis fhíordheimhnithe HTTP\n" " gan fanacht le dúshlán ón fhreastalaí\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Roghanna HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2148,40 +2123,40 @@ msgstr "" " --secure-protocol=PR roghnaigh prótacal slán: auto, SSLv2,\n" " SSLv3, TLSv1 nó PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only ná lean ach nascanna HTTPS\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ná bailíochtaigh teastas an fhreastalaí\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=COMHAD comhad teastais an chliaint\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=CINL cineál teastais an chliaint: PEM nó DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=COMHAD comhad don eochair phríobháideach\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=CINL cineál na heochrach príobháidí, PEM nó DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=COMHAD comhad ina bhfuil an burla CAnna\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2189,11 +2164,11 @@ msgstr "" " --ca-directory=COMHADLN comhadlann ina gcoinnítear an liosta " "haiseáilte de CAnna\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=COMHAD comhad ina bhfuil burla CRLanna\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2210,7 +2185,7 @@ msgstr "" "an\n" " acmhainn i gcéin a dheimhniú\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2218,7 +2193,7 @@ msgstr "" " --random-file=COMHAD comhad ina bhfuil sonraí randamacha chun an " "SSL PRNG a shíolrú\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2226,15 +2201,15 @@ msgstr "" " --egd-file=COMHAD comhad a ainmníonn an soicéad EGD le sonraí " "randamacha\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Roghanna HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts díchumasaigh HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2242,11 +2217,11 @@ msgstr "" " --hsts-file cosán go dtí an bunachar sonraí HSTS " "(sáraíonn seo an réamhshocrú)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Roghanna FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2254,35 +2229,35 @@ msgstr "" " --ftp-stmlf úsáid formáid Stream_LF le haghaidh gach " "comhaid dhénártha FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=ÚSÃIDEOIR socraigh an tÚSÃIDEOIR ftp\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=FF socraigh an focal faire ftp\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ná bain comhaid '.listing'\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob ná déan globáil le hainmneacha comhaid FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp díchumasaigh an mód aistrithe \"passive\"\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions caomhnaigh ceadanna an chomhaid i gcéin\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2290,11 +2265,11 @@ msgstr "" " --retr-symlinks faigh na comhaid a nasctar leo, agus á " "athchúrsáil\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Roghanna FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2302,7 +2277,7 @@ msgstr "" " --ftps-implicit úsáid FTPS intuigthe (port " "réamhshocraithe 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2312,7 +2287,7 @@ msgstr "" "tosaíodh sa cheangal rialaithe nuair\n" " a osclófar ceangal nua sonraí\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2320,7 +2295,7 @@ msgstr "" " --ftps-clear-data-connection rúnscríobh an cainéal rialaithe " "amháin; beidh na sonraí go léir i nglantéacs\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2328,11 +2303,11 @@ msgstr "" " --ftps-fallback-to-ftp úsáid FTP mar thacachumas mura " "dtacaíonn an freastalaí le FTPS\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Roghanna WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2340,45 +2315,45 @@ msgstr "" " --warc-file=COMHAD sábháil sonraí an iarratais/fhreagra i " "gcomhad .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=TEAGHRÃN cuir TEAGHRÃN sa taifead warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " --warc-max-size=UIMHIR socraigh uasmhéid na gcomhad WARC\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx scríobh comhad innéacsaithe CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" " --warc-dedup=COMHAD ná stóráil taifid atá sa chomhad CDX seo\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ná comhbhrúigh comhaid WARC le GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ná ríomh haiseanna SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log ná stóráil an logchomhad i dtaifead WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2387,15 +2362,15 @@ msgstr "" " --warc-tempdir=COMHADLANN áit ina gcruthóidh an scríbhneoir WARC " "comhaid shealadacha\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Ãoslódáil athchúrsach:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive íoslódáil go hathchúrsach\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2403,14 +2378,14 @@ msgstr "" " -l, --level=UIMHIR doimhneacht athchúrsála is mó (inf nó 0 = gan " "teorainn)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" " --delete-after scrios comhaid go háitiúil i ndiaidh íoslódála\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2418,7 +2393,7 @@ msgid "" msgstr "" " -k, --convert-links nasc le comhaid áitiúla i HTML/CSS íoslódáilte\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2426,7 +2401,7 @@ msgstr "" " --convert-file-only ná tiontaigh ach an chuid den URL a " "shonraíonn an comhad féín (a dtugtar 'an bunainm' air)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2434,7 +2409,7 @@ msgstr "" " --backups=N sula scríobhtar comhad, rothlaigh suas le " "N comhad cúltaca\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2442,7 +2417,7 @@ msgstr "" " -K, --backup-converted déan cúltaca mar X_orig sula dtiontaítear comhad " "X\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2450,14 +2425,14 @@ msgstr "" " -K, --backup-converted déan cúltaca mar X.orig sula dtiontaítear comhad " "X\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" " -m, --mirror ar comhbhrí le -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2465,7 +2440,7 @@ msgstr "" " -p, --page-requisites faigh gach íomhá, srl. ag teastáil chun " "leathanach HTML a thaispeáint\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2473,11 +2448,11 @@ msgstr "" " --strict-comments láimhseáil dhocht de nótaí tráchta HTML (.i. mar " "SGML)\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Glacadh/diúltú athchúrsach:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2485,7 +2460,7 @@ msgstr "" " -A, --accept=LIOSTA iarmhíreanna inghlactha, scartha le " "camóga\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2493,47 +2468,47 @@ msgstr "" " -R, --reject=LIOSTA iarmhíreanna diúltaithe, scartha le " "camóga\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=SLONN slonn ionadaíochta a mheaitseálann " "URLanna a nglacfar leo\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=SLONN slonn ionadaíochta a mheaitseálann " "URLanna nach nglacfar leo\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=CINEÃL cineál an tsloinn ionadaíochta (posix|" "pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=CINEÃL cineál an tsloinn ionadaíochta (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIOSTA fearainn inghlactha, scartha le camóga\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIOSTA fearainn diúltaithe, scartha le camóga\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp lean naisc FTP i gcáipéisí HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2541,7 +2516,7 @@ msgstr "" " --follow-tags=LIOSTA clibeanna HTML le leanúint, scartha le " "camóga\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2549,20 +2524,20 @@ msgstr "" " --ignore-tags=LIOSTA clibeanna HTML nach mbactar leo, scartha " "le camóga\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts oscail óstaigh i gcéin más athchúrsach é\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative ná lean ach naisc choibhneasta\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIOSTA comhadlanna ceadaithe\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2572,82 +2547,82 @@ msgstr "" "dheireanach\n" "den URL atreoraithe\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIOSTA comhadlanna neamhcheadaithe\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent ná téigh suas go comhadlanna níos airde.\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Seol tuairiscí ar fhabhtanna agus moltaí chuig \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget, leagan %s, íoslódálaí neamh-idirghníomhach.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Focal faire le haghaidh %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Focal faire: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Ní féidir píopa a chruthú\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Earráid agus sceitheadh comhad á thúsú le haghaidh use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Earráid agus sceitheadh comhad á shocrú le haghaidh use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Earráid agus an freagra ó ordú \"%s %s\" á léamh: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Ainm úsáideora le haghaidh '%s%s': " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Focal faire le haghaidh '%s%s@%s': " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Logchaighdeán: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Tiomsú: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Nasc: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2656,29 +2631,29 @@ msgstr "" "GNU Wget %s tógtha ar %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (úsáideoir)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (córas)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2692,7 +2667,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2700,39 +2675,39 @@ msgstr "" "\n" "Scríofa ar dtús ag Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Seol tuairiscí ar fhabhtanna agus ceisteanna chuig .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Fadhb agus cuimhne á leithdháileadh\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "à scor mar gheall ar earráid i %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Bain triail as `%s --help' chun tuilleadh roghanna a fheiceáil.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: rogha neamhcheadaithe -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Níor tiomsaíódh an clár seo le tacaíocht dífhabhtaithe. Déanfar neamhaird " "den bhratach --debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2741,7 +2716,7 @@ msgstr "" "Sonraíodh --no-clobber agus --convert-links. Úsáidfear --convert-links " "amháin.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2750,23 +2725,23 @@ msgstr "" "Sonraíodh --no-clobber agus --convert-file-only. Úsáidfear --convert-file-" "only amháin.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ní féidir a bheith foclach agus tostach san am céanna.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ní féidir stampaí ama a dhéanamh gan forscríobh ar do chuid sheanchomhaid.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ní féidir --inet4-only agus --inet6-only a shonrú araon.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2779,7 +2754,7 @@ msgstr "" "fháil.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2789,7 +2764,7 @@ msgstr "" "íoslódáilte go léir sa chomhad a roghnaigh tú.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2799,12 +2774,7 @@ msgstr "" "lámhleabhar chun tuilleadh eolais a fháil.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Tá an comhad `%s' ann cheana; ní aisghabhfar é.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2812,19 +2782,19 @@ msgstr "" "Ní fheidhmíonn aschur WARC leis an rogha --no-clobber; díchumasófar --no-" "clobber.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Ní fheidhmíonn aschur WARC le stampaí ama; díchumasófar na stampaí ama.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Ní fheidhmíonn aschur WARC in éineacht le --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2833,14 +2803,14 @@ msgstr "" "Ní fheidhmíonn aschur WARC in éineacht le --continue nó --start-pos; " "díchumasófar iad.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Díchumasaíodh achoimrí; ní bheidh WARC in ann taifeadtaí dúbailte a aimsiú.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2849,12 +2819,12 @@ msgstr "" "Ní fheidhmíonn aschur WARC in éineacht le --continue nó --start-pos; " "díchumasófar iad.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ní féidir --ask-password agus --password a thabhairt le chéile.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2863,17 +2833,17 @@ msgstr "" "Ní mholtar duit --start-pos agus --continue a úsáid le chéile; díchumasófar " "--continue.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL ar iarraidh\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ní féidir --post-data agus --post-file a thabhairt le chéile.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2882,7 +2852,7 @@ msgstr "" "Ní féidir --post-data nó --post-file a úsáid in éineacht le --method, rogha " "atá ag súil le sonraí trí na roghanna --body-data nó --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2891,17 +2861,17 @@ msgstr "" "Caithfidh tú modh a roghnú le --method=HTTPMethod a úsáidfar in éineacht le " "--body-data nó --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ní féidir --body-data agus --body-file a thabhairt le chéile.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ní thacaíonn an leagan seo le IRIanna\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2909,7 +2879,7 @@ msgstr "" "Is féidir -k nó -r a úsáid in éineacht le -O ach amháin má tá tú ag scríobh " "i ngnáthchomhad.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2918,42 +2888,42 @@ msgstr "" "Is féidir --convert-links nó --convert-file-only a úsáid le chéile ach " "amháin má tá tú ag scríobh i ngnáthchomhad.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Níorbh fhéidir libcares a thúsú\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Níorbh fhéidir cainéal c-ares a thúsú\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Níorbh fhéidir an seoladh IP '%s' a pharsáil\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Níorbh fhéidir freastalaí nó freastalaithe DNS '%s' a shocrú (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Níor aimsíodh aon URL i %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Níorbh fhéidir an comhad meiteanaisc %s a pharsáil.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Níorbh fhéidir na hacmhainní go léir a íoslódáil ó %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2964,7 +2934,7 @@ msgstr "" "Am iomlán (clog balla): %s\n" "Ãoslódáilte: %d comhad, %s i %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Sáraíodh cuóta íoslódála %s!\n" @@ -3121,104 +3091,104 @@ msgstr "Fuarthas comhad %s ach ní mheaitseálann an síniú. \n" msgid "Renaming %s to %s.\n" msgstr "Ainm á athrú ó %s go %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "à leanúint sa chúlra.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "à leanúint sa chúlra, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Scríobhfar an t-aschur i %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "Theip ar fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "Theip ar fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Níorbh fhéidir tiománaí inúsáidte soicéid a aimsiú.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Theip ar ioctl(). Níorbh fhéidir an soicéad a shocrú mar bhlocáil.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: rabhadh: tagann an teaghrán %s roimh aon ainm meaisín\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: teaghrán anaithnid comharthach \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Úsáid: %s NETRC [ÓSTAINM]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ní féidir %s a stat: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "RABHADH: síol lag randamach in úsáid.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Níorbh fhéidir PRNG a shíolú; b'fhéidir --random-file a úsáid.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Tá an leagan de OpenSSL atá agat róshean le tacú le TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Tá an leagan de OpenSSL atá agat róshean le tacú le TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: níl luach %d ar fáil le rogha 'secure-protocol'\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: ní féidir teastas %s a fhíorú, eisithe ag %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ní féidir údarás an eisitheora a fhíorú go háitiúil.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Teastas féinsínithe.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Níl an teastas eisithe bailí fós.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Tá an teastas imithe as feidhm.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3227,7 +3197,7 @@ msgstr "" "%s: níl aon ainm malartach ar ábhar an teastais ann a mheaitseálann\n" "\tan t-óstainm iarrtha %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3235,7 +3205,7 @@ msgstr "" " %s: níl ainm coitianta an teastais %s comhoiriúnach leis an óstainm " "iarrtha %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3245,13 +3215,13 @@ msgstr "" " %s: tá gnáthainm an teastais neamhbhailí (tá carachtar NUL ann).\n" " Seans ann go ciallaíonn seo nach é an t-óstríomhaire an fíor %s.\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Chun ceangal neamhshlán a dhéanamh le %s, úsáid `--no-check-certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3260,28 +3230,28 @@ msgstr "" "\n" "%*s[ ag dul thar %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Sonrú neamhbhailí ar stíl phonc %s; á fágáil gan athrú.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " i " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ní féidir minicíocht an chloig REALTIME a fháil: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Ag baint %s toisc gur ceart é a dhiúltú.\n" @@ -3295,22 +3265,22 @@ msgstr "Ní féidir %s a oscailt: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt á lódáil; déan neamhaird d'earráidí le do thoil.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Earráid agus URL an seachfhreastalaí %s á pharsáil: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Earráid i URL seachfhreastalaí %s: Ní foláir a bheith HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "níos mó ná %d atreorú.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3318,7 +3288,7 @@ msgstr "" "à éirí as.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3326,125 +3296,125 @@ msgstr "" "à triail arís.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ní raibh aon earráid" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Scéim gan tacaíocht %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Scéim ar iarraidh" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Óstainm neamhbhailí" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Drochuimhir phoirt" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ainm neamhbhailí úsáideora" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Seoladh uimhriúil IPv6 gan chríochnú" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Níl seoltaí IPv6 ar fáil" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Seoladh uimhriúil IPv6 neamhbhailí" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Níor tógadh an clár seo le tacaíocht HTTPS" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Chonacthas seicheamh ilbheart neamhiomlán nó neamhbhailí\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Níorbh fhéidir cuimhne a leithdháileadh; cuimhne ídithe.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Níorbh fhéidir %ld beart a leithdháileadh; cuimhne ídithe.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: maolán téacs rómhór (%d beart), á thobscor.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "à leanúint sa chúlra, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Níorbh fhéidir nasc siombalach %s a dhínascadh: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Níorbh fhéidir libcares a thúsú\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Níorbh fhéidir ceadanna le haghaidh %s a shocrú.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Níorbh fhéidir ceadanna le haghaidh %s a shocrú.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Níorbh fhéidir an seoladh IP '%s' a pharsáil\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Níorbh fhéidir ceadanna le haghaidh %s a shocrú.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Slonn ionadaíochta neamhbhailí %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Earráid agus %s á mheaitseáil: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3538,6 +3508,24 @@ msgstr "" "Aimsíodh toradh beacht sa chomhad CDX. Taifead athchuairte á shábháil le " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '--%s'\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: rogha anaithnid '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: Tá an rogha '-W %s' débhríoch\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha '-W %s'\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: tá argóint de dhíth i ndiaidh na rogha '-W %s'\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Tá an comhad `%s' ann cheana; ní aisghabhfar é.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/gl.gmo b/po/gl.gmo index 1c953b0..c88fa69 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index e2c3707..eef48cd 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.14\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2012-11-11 23:30+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -24,7 +24,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Erro de sistema descoñecido" @@ -33,7 +33,7 @@ msgstr "Erro de sistema descoñecido" msgid "Address family for hostname not supported" msgstr "Non se admiten os enderezos IPv6" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -103,70 +103,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Erro descoñecido" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a opción «%s» é ambigua; as posibilidades son:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a opción «-W %s» é ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opción «--%s» non permite ningún argumento\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: a opción «%s» é ambigua; as posibilidades son:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opción «%c%s» non recoñecida\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opción «%c%s» non permite ningún argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opción «--%s» require un argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opción «--%s» non recoñecida\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opción «%c%s» non recoñecida\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción incorrecta -- «%c»\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opción require un argumento -- «%c»\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opción «-W %s» é ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opción «-W %s» non permite ningún argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opción «-W %s» require un argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -186,13 +161,13 @@ msgstr "%s: a opción «-W %s» require un argumento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -272,29 +247,29 @@ msgstr "Expresión regular non válida %s, %s\n" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 #, fuzzy msgid "No previous regular expression" msgstr "Expresión regular non válida %s, %s\n" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -313,51 +288,51 @@ msgstr "" msgid "memory exhausted" msgstr "esgotouse a memoria" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Conectando con %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Conectando con %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Conectando con [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "conectado.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "fallou: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -391,175 +366,175 @@ msgstr "Non é posíbel eliminar %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Non é posíbel crear unha copia de seguridade de %s como %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Non é posíbel eliminar %s: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Erro de sintaxe en Set-Cookie: %s na posición %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Unha cookie procedente de %s intentou definir o dominio como %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Non é posíbel abrir o ficheiro de cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Produciuse un erro ao escribir en %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Produciuse un erro ao pechar %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Tipo de lista non compatíbel, probando o analizador de listas de Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ãndice de /%s en %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "tempo descoñecido " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Ficheiro " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Directorio " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Ligazón " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Non seguro " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Lonxitude: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", quedan %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", quedan %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (dato non fidedigno)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Identificándome como %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Erro na resposta do servidor, pechando a conexión de control.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Erro no saúdo do servidor.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Erro ao escribir, pechando a conexión de control.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "O servidor rexeita o login.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Login incorrecto.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Conectado!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Erro no servidor, non é posíbel determinar o tipo do sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "feito. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "feito.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo «%c» descoñecido, pechando a conexión de control.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "feito. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> non foi necesario CWD.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -567,7 +542,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -576,37 +551,37 @@ msgstr "" "Non existe tal directorio %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> non se require CWD.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "O ficheiro xa se descargou.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Non foi posíbel comezar a transferencia PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Non foi posíbel analizar a resposta PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "non foi posíbel conectar a %s porto %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Erro facendo bind (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT incorrecto.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -614,17 +589,17 @@ msgstr "" "\n" "REST fallou, comezando desde o principio.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "O ficheiro %s existe.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Non hai tal ficheiro %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -633,7 +608,7 @@ msgstr "" "Non hai tal ficheiro %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -642,40 +617,40 @@ msgstr "" "Non hai tal ficheiro ou directorio %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, pechando a conexión de control.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Conexión de datos: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Conexión de control pechada.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Transferencia de datos interrompida.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "O ficheiro %s xa está aí, non se ha descargar.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(intento:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -684,7 +659,7 @@ msgstr "" "%s (%s) - escrito en stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -693,35 +668,35 @@ msgstr "" "%s (%s) - gardouse %s [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Retirando %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Usando %s como un ficheiro temporal de lista.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Retirouse %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "A profundidade de recursión %d excedeu a máxima %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "O ficheiro remoto non é máis novo que o ficheiro local %s -- non se " "descarga.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -730,7 +705,7 @@ msgstr "" "O ficheiro remoto é máis novo que o ficheiro local %s -- descargando.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -739,11 +714,11 @@ msgstr "" "Os tamaños non coinciden (local %s) -- descargando.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "O nome da ligazón simbólica é incorrecto, omitindo.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -752,242 +727,242 @@ msgstr "" "Xa ten unha ligazón simbólica correcta %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creando a ligazón simbólica %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Non se admiten ligazóns simbólicas, omitindo a ligazón simbólica %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Omitindo o directorio %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo de ficheiro descoñecido ou non compatíbel.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Non se puido obte-la clave do certificado de %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: marca de tempo danada.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Non se han descargar directorios, porque a profundidade chegou a %d (máximo " "%d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Non se ha descender a %s porque está excluído ou non incluído.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Rexeitando %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Produciuse un erro ao comparar %s contra %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Non coincide co patron %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Escrito un índice en HTML en %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Escrito un índice en HTML en %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERRO: non é posíbel abrir o directorio %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, fuzzy, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERRO: non é posíbel abrir o directorio %s.\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Non se puideron carga-los certificados de %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ERRO: GnuTLS require que a clave e o certificado sexan do mesmo tipo.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Envíe informes de fallo e preguntas a .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERRO" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, fuzzy, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "O certificado aínda non está activado\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Revogouse o certificado de %s.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Produciuse un erro ao inicializar o certificado X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Non se atopou ningún certificado\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Produciuse un erro ao analizar o certificado: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "O certificado aínda non está activado\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "O certificado caducou\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "O propietario do certificado non coincide co nome de servidor %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Servidor descoñecido" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Resolvendo %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "fallou: tempo esgotado.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Non foi posíbel resolver a ligazón incompleta %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL %s non válido: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Produciuse un erro ao escribir unha petición HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Non hai cabeceiras, asúmese HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -996,133 +971,133 @@ msgstr "" "O ficheiro %s xa está aí, non se ha descargar.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizando a conexión existente con [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizando a conexión existente con %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Produciuse un erro ao ler a resposta do proxy: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Liña de estado mal formada" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Sistema de autenticación descoñecido.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Sistema de autenticación descoñecido.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Gardando en: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Desactivando SSL debido aos erros encontrados.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Petición %s enviada, agardando unha resposta... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Non se recibiron datos.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro ao ler (%s) nas cabeceiras.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sen descrición)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Localización: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "non especificado" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [seguíndoo]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1130,7 +1105,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1140,80 +1115,80 @@ msgstr "" " O ficheiro xa está completo; non hai nada que facer.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Lonxitude: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorado" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: comodíns non compatíbeis en HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Non é posíbel escribir en %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Non foi posíbel establecer a conexión SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Non é posíbel desligar %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redirección (%d) sen destino.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto non exite -- ligazón rota!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Falta a cabeceira Last-modified -- marcas de tempo desactivadas.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Cabeceira Last-modified incorrecta -- ignorouse a marca de tempo.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1223,16 +1198,16 @@ msgstr "" "descarga.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamaños non coinciden (local %s) -- descargando.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "O ficheiro remoto é máis novo, descargando.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1242,7 +1217,7 @@ msgstr "" "descargando.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1251,14 +1226,14 @@ msgstr "" "descarga.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1266,12 +1241,12 @@ msgstr "" "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1280,7 +1255,7 @@ msgstr "" "%s (%s) - escrito en stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1289,58 +1264,58 @@ msgstr "" "%s (%s) - gardouse %s [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexión pechada no byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de lectura no byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Erro de lectura no byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Esquema %s non compatíbel" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC apunta a %s, que non existe.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Non é posíbel ler %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Erro en %s na liña %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Erro de sintaxe en %s na liña %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Orde descoñecida %s en %s na liña %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1348,7 +1323,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1356,75 +1331,75 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Aviso: Os ficheiros wgetrc do sistema e do usuario apuntan a %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Orde --execute non válida %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Booleano %s non válido, empregue «on» ou «off».\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Booleano %s non válido, empregue «on» ou «off».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Número %s non válido.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Valor de byte %s non válido\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Período de tempo %s non válido\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Valor %s non válido.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Cabeceira %s non válida.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Cabeceira WARC %s non válida.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tipo de progreso %s non válido.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1433,40 +1408,40 @@ msgstr "" "%s: %s: Restricción %s non válida,\n" " empregue [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "A codificación %s non é válida\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode fallou (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "non foi posíbel conectar a %s porto %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1475,17 +1450,17 @@ msgstr "" "\n" "Recibiuse %s, redireccionando a saída a %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; desactivando o rexistro.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uso: %s [OPCIÓN]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1493,130 +1468,130 @@ msgstr "" "Os argumentos obrigatorios nas opcións longas tamén o son nas curtas.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Inicio:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version mostra a versión de Wget e sae.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=ORDE executa unha orde de estilo «.wgetrc».\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Ficheiros de rexistro e de entrada:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FICHEIRO rexistra as mensaxes en FICHEIRO.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -o, --output-file=FICHEIRO rexistra as mensaxes en FICHEIRO.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug mostra unha chea de información de depuración.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " -d, --debug mostra unha chea de información de depuración.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html tratar o ficheiro de entrada como HTML.\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Descarga:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1624,200 +1599,200 @@ msgstr "" " --retry-connrefused reintentar incluso se se rexeita a " "conexión.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -o, --output-file=FICHEIRO rexistra as mensaxes en FICHEIRO.\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies non usar cookies.\n" +msgstr " --spider non descargar nada.\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response mostrar a resposta do servidor.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr " -w, --wait=SEGUNDOS agarda SEGUNDOS entre descargas.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conectar só a enderezos IPv4.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conectar só a enderezos IPv6.\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1828,235 +1803,235 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Directorios:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opcións de HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=USUARIO definir o usuario de HTTP como USUARIO.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-user=USUARIO definir o usuario de HTTP como USUARIO.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --ask-password solicitar os contrasinais.\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers gardar as cabeceiras de HTTP no ficheiro.\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2064,13 +2039,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2078,70 +2053,70 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcións de HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --config=FICHEIRO Especificar o ficheiro de configuración a " "usar.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2151,243 +2126,243 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Opcións de HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opcións de FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-user=USUARIO definir o usuario de FTP como USUARIO.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing non retirar os ficheiros «.listing».\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-iri desactivar a compatibilidade IRI.\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " -S, --server-response mostrar a resposta do servidor.\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Opcións de FTP:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opcións WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=CADEA inserir CADEA entre as cabeceiras.\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies non usar cookies.\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Descarga recursiva:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive especificar a descarga recursiva.\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --spider non descargar nada.\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2396,7 +2371,7 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2405,23 +2380,23 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2429,7 +2404,7 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2437,12 +2412,12 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2451,7 +2426,7 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2460,105 +2435,105 @@ msgstr "" " --ignore-tags=LISTA lista separada por comas de etiquetas " "HTML ignoradas.\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -h, --help mostra esta axuda.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -x, --force-directories forzar a creación de directorios.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -nd, --no-directories non crear directorios.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Envíe informes de fallo e suxestións a .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, un descargador de ficheiros de rede non interactivo.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Contrasinal do usuario %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Contrasinal: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "Non é posíbel escribir no ficheiro WARC.\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Contrasinal do usuario %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Ligazón: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2567,29 +2542,29 @@ msgstr "" "GNU Wget %s compilouse en %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (usuario)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2011 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2603,7 +2578,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2611,67 +2586,67 @@ msgstr "" "\n" "Escrito orixinalmente por Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Envíe informes de fallo e preguntas a .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Execute «%s --help» para obter máis información.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opción inaceptábel -- «-n%c»\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Non é posíbel ser moi falador e estar en silencio ao mesmo tempo.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Non é posíbel poñer unha marca de tempo e non machacar os ficheiros antigos " "ao mesmo tempo.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2679,160 +2654,155 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "O ficheiro «%s» xa está aí, non se ha descargar.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Non é posíbel especificar á vez tanto --ask-password como --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta o URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Non é posíbel especificar á vez tanto --ask-password como --password.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" "Non é posíbel especificar á vez tanto --ask-password como --password.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Esta versión non é compatíbel con IRIs\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "-k pode usarse xunto con -O só se a saída é un ficheiro normal.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "-k pode usarse xunto con -O só se a saída é un ficheiro normal.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Produciuse un erro ao desligar a ligazón simbólica %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Non se atoparon URLs en %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Non é posíbel eliminar %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "Non se puideron carga-los certificados de %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2840,7 +2810,7 @@ msgid "" "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "SUPEROUSE a cota de descarga de %s!\n" @@ -2997,117 +2967,117 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Retirando %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Continuando en segundo plano.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Continuando en segundo plano, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Vaise escribir a saída en %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Non foi posíbel atopar un controlador de sockets utilizábel.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: aviso: o elemento %s aparece antes dos nomes de máquina\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: elemento «%s» descoñecido\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [SERVIDOR]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: non é posíbel obter información de %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Non foi posíbel sementar PRNG; considere empregar --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Encontrouse un certificado autoasinado.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3115,13 +3085,13 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Para conectar de forma non segura con %s, use «--no-check-certificate».\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3130,29 +3100,29 @@ msgstr "" "\n" "%*s[ omitindo %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Especificación de estilo de puntos %s non válida; queda sen cambiar.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " en " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Retirando %s porque debería ser rexeitado.\n" @@ -3166,22 +3136,22 @@ msgstr "Non é posíbel abrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Cargando robots.txt; ignore os erros.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Produciuse un erro ao analizar o URL do proxy %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL do proxy %s: Debe ser HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Superáronse %d redireccións.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3189,7 +3159,7 @@ msgstr "" "Abandonando.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3197,127 +3167,127 @@ msgstr "" "Intentándoo de novo.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ningún erro" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Esquema %s non compatíbel" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Falta o esquema" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "O nome do servidor non é válido" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Número de porto erróneo" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "O nome do usuario non é válido" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Enderezo IPv6 numérico sen rematar" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Non se admiten os enderezos IPv6" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Enderezo IPv6 numérico non válido" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Non se compilou con compatibilidade para HTTPS" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Produciuse un erro ao asignar memoria dabondo; esgotouse a memoria.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" "%s: %s: Produciuse un erro ao asignar %ld bytes; esgotouse a memoria.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: o búfer de texto é grande de máis (%ld bytes), interrompendo.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando en segundo plano, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Produciuse un erro ao desligar a ligazón simbólica %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Produciuse un erro ao desligar a ligazón simbólica %s: %s\n" +msgstr "Non se puideron carga-los certificados de %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Non se puido obte-la clave do certificado de %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Non se puido obte-la clave do certificado de %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "ERRO: non é posíbel abrir o directorio %s.\n" +msgstr "Non se puideron carga-los certificados de %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Non se puido obte-la clave do certificado de %s\n" +msgstr "Non se puideron carga-los certificados de %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expresión regular non válida %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Produciuse un erro ao comparar %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3400,6 +3370,34 @@ msgstr "Non é posíbel escribir no ficheiro WARC temporal.\n" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a opción «--%s» non permite ningún argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opción «--%s» non recoñecida\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a opción «-W %s» non permite ningún argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a opción «-W %s» require un argumento\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Fallo na autorización.\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "idn_decode fallou (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "Recibiuse %s.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "O ficheiro «%s» xa está aí, non se ha descargar.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3420,23 +3418,6 @@ msgstr "" #~ "Atopáronse %d ligazóns rotas.\n" #~ "\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: URL %s non válido: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "idn_decode fallou (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "Recibiuse %s.\n" - -#~ msgid "Authorization failed.\n" -#~ msgstr "Fallo na autorización.\n" - #~ msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" #~ msgstr "" #~ "Non se puido converter `%s' a un enderezo de asignación. Cambiando a " diff --git a/po/he.gmo b/po/he.gmo index 0867cee..2ccd4be 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/he.po b/po/he.po index f9e2d60..0b7141c 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.8.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2002-02-03 20:08+0200\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "ääåæî-éúìá äì÷ú" @@ -25,7 +25,7 @@ msgstr " msgid "Address family for hostname not supported" msgstr "" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -93,70 +93,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "ääåæî-éúìá äì÷ú" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s úéðëú é\"ò øëåî åðéà `%c%s' ïééôàî\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s úéðëú é\"ò øëåî åðéà `--%s' ïééôàî\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s úéðëú é\"ò øëåî åðéà `%c%s' ïééôàî\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -176,13 +151,13 @@ msgstr "%s #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -255,28 +230,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -295,7 +270,7 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" @@ -303,7 +278,7 @@ msgstr "" # FIXME: this is lame! The method of printing "Frobbing...done" etc. # does not lend itself to good translations into languages where # such sentences have a different structure, and should be rethought. -#: src/connect.c:283 +#: src/connect.c:281 #, fuzzy, c-format msgid "Connecting to %s|%s|:%d... " msgstr "%s:%hu-ì úåøù÷úä ïåéñð" @@ -311,7 +286,7 @@ msgstr "%s:%hu- # FIXME: this is lame! The method of printing "Frobbing...done" etc. # does not lend itself to good translations into languages where # such sentences have a different structure, and should be rethought. -#: src/connect.c:291 +#: src/connect.c:289 #, fuzzy, c-format msgid "Connecting to %s:%d... " msgstr "%s:%hu-ì úåøù÷úä ïåéñð" @@ -319,38 +294,38 @@ msgstr "%s:%hu- # FIXME: this is lame! The method of printing "Frobbing...done" etc. # does not lend itself to good translations into languages where # such sentences have a different structure, and should be rethought. -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "%s:%hu-ì úåøù÷úä ïåéñð" -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" # Pay attention: this is written to the RIGHT of "Connecting.." !! -#: src/connect.c:358 +#: src/connect.c:356 #, fuzzy msgid "connected.\n" msgstr "á äçìöä\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -385,76 +360,76 @@ msgstr "`%s' msgid "Cannot back up %s as %s: %s\n" msgstr "%s-ì éåáéâë %s úáéúëá (%s) äì÷ú\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "`%s' ÷åçîì ïåéñðá (%s) äì÷ú\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, fuzzy, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr ".éãî íã÷åî úîééúñî úæåøçîä :Set-Cookie úøúåë ìù éåâù øéáçú\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "`%s' úåéâåò õáå÷ úçéúô úòá (%s) äì÷ú äòøéà\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "`%s' úøéâñá (%s) äì÷ú\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr ".Unix èîøåô åîë ùøôì äñðî ,øëåî-éúìá âåñî íéöá÷ úîéùø\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s äé÷éúá %s:%d-á íéöá÷ úîéùø" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr " òåãé àì ïåëãò ïîæ" -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr " õáå÷" -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr " äé÷éú" -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr " øåùé÷" -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr " òåãé àì âåñ" -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (íéúá %s)" @@ -462,101 +437,101 @@ msgstr " ( # FIXME: This 3-part message will look totally messed up in a # right-to-left language such as Hebrew! The maintainers # should _really_ fix the code! -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "%s :êøåà" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (äëøòä)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "%s-ë äñéðë ïåéñð" -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr ".øâñð äø÷áä ÷éôà ,úøù ìù éåâù äðòî\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr ".éåâù úøùä ìù äçéúô øñî\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr ".øâñð äø÷áä ÷éôà ,äáéúëá äì÷ú\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr ".äñéðë äùøî åðéà úøùä\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr ".äéåâù äñéðë\n" # Note: this is written to the right of "Logging in as", with no newline! -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "á äçìöä\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr ".úëøòî âåñ òåá÷ì úåøùôà ïéà ,úøù ìù éåâù äðòî\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr " <== äçìöäá òöåá" -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr " <== äçìöäá òöåá\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr ".øâñð äø÷áä ÷éôà ,øëåî åðéà `%c' äøáòä âåñ\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr " <== äçìöäá òöåá" -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> .úùøãð äðéà CWD úãå÷ô\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -564,7 +539,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -573,38 +548,38 @@ msgstr "" ".úîéé÷ äðéà `%s' äé÷éú\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> .CWD úãå÷ôá êøåö ïéà\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr ".PASV úèéùá äøáòä òéðúäì ïúéð àì\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr ".PASV úãå÷ôì äðòî ùøôì ïúéð àì\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr ".(%s) úåøù÷úä úì÷ú\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr ".PORT úì÷ú\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -612,19 +587,19 @@ msgstr "" "\n" ".äìçúäî ìéçúî ;äìùëð REST úãå÷ô\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" ".íéé÷ åðéà `%s' õáå÷\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -633,7 +608,7 @@ msgstr "" ".íéé÷ åðéà `%s' õáå÷\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -642,44 +617,44 @@ msgstr "" ".íéîéé÷ äé÷éú åà õáå÷ åðéà `%s'\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr ".øâñð äø÷áä ÷éôà ,%s-á (%s) äì÷ú\n" # Note: the rightmost colon is for the message that will be printed # later. -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "(%s :äòù %s :áö÷) íéðåúðä ÷éôàá (%s) äì÷ú :" # Note: this and the next one don't have the period because they get # printed to the right of the previous message. -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "øâñð äø÷áä ÷éôà\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "ä÷ñôåä íéðåúð úøáòä\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(%2d 'ñî ïåéñð)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -687,7 +662,7 @@ msgid "" msgstr "" # I give up! -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -696,430 +671,430 @@ msgstr "" "%s (%s) - `%s' saved [%ld]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr ".%s ÷çåî\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr ".íéöá÷ úîéùø úìá÷ì éðîæ õáå÷ë `%s'-á ùîúùî\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr ".÷çîð `%s' õáå÷\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr ".åéìò äìåò %d ìòåôá ÷îåò êà ,%d àåä éáøéî äéñøå÷ø ÷îåò\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà ÷çåøî õáå÷\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr ".êùîéé õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò ÷çåøî õáå÷\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr ".êùîéé õáå÷ä -- (%ld :éîå÷î õáå÷) ääæ åðéà ìãåâ\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr ".èîùåé õáå÷ä ,øëåî åðéà éìåáîéñ øåùé÷ õáå÷ ìù åîù\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr ".íéé÷ øáë %s -> %s éìåáîéñ øåùé÷\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr ".%s -> %s éìåáîéñ øåùé÷ øöåé\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr ".`%s' õáå÷ èéîùî ,íéëîúð íðéà éìåáîéñ øåùé÷ éöá÷\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr ".`%s' äé÷éú èéîùî\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr ".êîúð åðéà åà øëåî-éúìá âåñî åðéä `%s' õáå÷\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr ".äéåâù ïîæ úîéúç ìòá àåä `%s' õáå÷\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr ".øúåé áø %d ï÷îåò ïëù åëùîéé àì úåé÷éú ;%d éáøéî ÷îåò\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr ".äîéùøäî äàöåä åà äììëð àìù íåùî `%s'-ì ñðëéäìî òðîð\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr ".äçãð `%s'\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr ".`%s' úéðáúì úåîàúä ïéà\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "`%s'-ì äáúëð íéúá %ld ìãåâáå HTML èîøåôá íéöá÷ úîéùø\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "`%s'-ì äáúëð HTML èîøåôá íéöá÷ úîéùø\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 #, fuzzy msgid "Unknown host" msgstr "ääåæî-éúìá äì÷ú" -#: src/host.c:849 +#: src/host.c:847 #, fuzzy, c-format msgid "Resolving %s... " msgstr ".%s ÷çåî\n" -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "" -#: src/html-url.c:931 +#: src/html-url.c:929 #, fuzzy, c-format msgid "%s: Invalid URL %s: %s\n" msgstr ".%s äàøåäá `%s' éåâù êøò\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr ".HTTP úééðô ìù äçéìùá (%s) äì÷ú\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr ".%s:%hu-ì øåáéçá ùîúùäì êéùîî\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr ".%s:%hu-ì øåáéçá ùîúùäì êéùîî\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr ".HTTP úééðô ìù äçéìùá (%s) äì÷ú\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "áöîä úøåù ìù éåâù äðáî" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr ".úøëåî-éúìá úåîéà úèéù\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr ".úøëåî-éúìá úåîéà úèéù\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" # FIXME: This message can be followed by "%d %s", which prints # the operation status code and error message. I don't see how # can I make this look right in Hebrew... -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "...äáåùú úìá÷ì ïéúîî ,äçìùð %s úééðô " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "èì÷ éðåúð åìá÷úä àì" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr ".úåøúåë úàéø÷ úòá (%s) úì÷ú\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(äòåãé-éúìá äáéñ)" # Pay attention: the translation of "unspecified" goes to the # left of this, the translation of "[following]" goes to the right. -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "%s :øúàì áåúéð éåðéù%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "unspecified" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " øçà á÷åò" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1127,7 +1102,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1139,81 +1114,81 @@ msgstr "" # The next 3 messages are printed in order on the same line, and # this one is followed by a number! I give up!! -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Length: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignored" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr ".HTTP-á íéëîúð íðéà (wildcards) äììëä éåú :äøäæà\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr ".(SSL) çèáåàî øù÷ õåøò íé÷äì ïúéð àì\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr ".`%s' úáéúëá (%s) äì÷ú\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr ".øúà íù àìì áåúéð (%d) éåðéù :äì÷ú\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr ".úåðéîæ åéäé àì ïîæ úåîéúç -- äàöîð àì ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr ".ïîæä úîéúçî íìòúî -- äéåâù ïåøçà éåðéù ïîæ úøúåë\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1222,16 +1197,16 @@ msgstr "" ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà úøùá õáå÷\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr ".êùîéé õáå÷ä -- (%ld :éîå÷î õáå÷) ääæ åðéà ìãåâ\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1239,33 +1214,33 @@ msgid "" "\n" msgstr ".êùîéé õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr ".êùîéé àì õáå÷ä -- `%s' éîå÷î õáå÷î øúåé éðëãò åðéà ÷çåøî õáå÷\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr ".êùîéé õáå÷ä ,øúåé éðëãò ÷çåøî õáå÷\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1273,7 +1248,7 @@ msgid "" msgstr "" # Come on, are they serious?? -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1282,59 +1257,59 @@ msgstr "" "%s (%s) - `%s' saved [%ld/%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr ".øâñð øåáéçä ,%s-á (%s) íéúá %ld éøçà äì÷ú " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld éøçà (%s) äàéø÷ úì÷ú" -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr ".%s-á %s áö÷á åìá÷úðù íéúá %ld/%ld éøçà (%s) äàéø÷ úì÷ú " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:582 +#: src/init.c:581 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr ".%s úéðëú é\"ò %s õáå÷ úçéúôá (%s) äì÷ú\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr ".%s úéðëú øåáò äéåâù %s õáå÷á %d äøåù\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr ".%s úéðëú øåáò äéåâù %s õáå÷á %d äøåù\n" # This message is under "ifdef DEBUG", so no need to translate it. -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: BUG: unknown command `%s', value `%s'.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1342,7 +1317,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1350,132 +1325,132 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: ùîúùîä ìù ïäå úëøòîä ìù ïä wgetrc õáå÷ë ùîùî `%s' :äøäæà\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s äéåâù äãå÷ô\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: ãáìá off åà on íéëøò úìá÷î %s äàøåä\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s äàøåäá `%s' éåâù êøò\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "%s åìá÷úä ,`%%s'-ì èìô úééðôä\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "%s [ïééôàî]... [URL]... :ùåîéù ïôåà\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1485,291 +1460,291 @@ msgstr "" ".íéøö÷ íéðééôàîì íâ íééçøëä ,íéëåøà íéðééôàîì íééçøëää íéèðîåâøà\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1780,212 +1755,212 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 #, fuzzy msgid "Directories:\n" msgstr " äé÷éú" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1993,13 +1968,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2007,58 +1982,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2068,406 +2043,406 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr ".ìéòôî úåôúúùä àìì úùøäî íéöá÷ úëéùî ,%s àñøéâ GNU Wget úéðëú\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2477,7 +2452,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 #, fuzzy msgid "" "\n" @@ -2486,66 +2461,66 @@ msgstr "" "\n" ".Hrvoje Niksic é\"ò øå÷îá äáúëð åæ úéðëú\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr " . úáåúëì øåôéùì úåòöäå (bugs) äì÷ú éçååéã åçìù\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr ".øúåé áø òãéî úâöäì `%s --help' ùé÷äì äñð\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: `-n%c' éåâù ïééôàî\n" -#: src/main.c:1540 +#: src/main.c:1552 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr ".`--debug' ïééôàîá äëéîú íò äúðáð àì %s úéðëúä\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr ".äæ úà äæ íéøúåñ quiet-å verbose\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr ".äæ úà äæ íéøúåñ ïåøçà ïåëãò ïîæ íåùéøå íéîéé÷ íéöá÷ ìò äøéîù\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2553,157 +2528,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr ".åúåà êåùîì êøåö ïéà ,ïàë øáë `%s' õáå÷\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: øñç URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr ".%s-á URL óà àöîð àì\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "`%s' ÷åçîì ïåéñðá (%s) äì÷ú\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2714,7 +2684,7 @@ msgstr "" "--%s-- äòùá íééúñä\n" "íéúá %s ,íéöá÷ %d åëùîð\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "!(íéúá %s) äëéùî úìáâîî äâéøç\n" @@ -2870,117 +2840,117 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr ".%s ÷çåî\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr ".ò÷øá êéùîî\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr ".ò÷øá êéùîî\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr ".`%s'-ì áúëéé èìô\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Couldn't find usable socket driver.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: áùçîä íù øãâåäù éðôì äòéôåî \"%s\" çúôî úìéî :äøäæà\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: \"%s\" úøëåî-éúìá çúôî úìéî\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "%s NETRC [çøàî-áùçî íù] :ùåîéùä ïôåà\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s úéðëúá %s õáå÷ì äùéâá (%s) äì÷ú\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2988,12 +2958,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -3002,28 +2972,28 @@ msgstr "" "\n" " [ %dK ìò âìãî ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr ".÷çîéé ïë-ìòå äçãð %s\n" @@ -3037,22 +3007,22 @@ msgstr " msgid "Loading robots.txt; please ignore errors.\n" msgstr ".äàéâù úåòãåäî íìòúäì àð ;robots.txt õáå÷ ïòåè\n" -#: src/retr.c:913 +#: src/retr.c:912 #, fuzzy, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/retr.c:925 +#: src/retr.c:924 #, fuzzy, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr ".HTTP úåéäì áééç :%s äùøåî úøù\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, fuzzy, c-format msgid "%d redirections exceeded.\n" msgstr ".%s úéðëúá úéìâòî äééðôä äúìâúä\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3060,7 +3030,7 @@ msgstr "" "!òðëð éðà\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3068,127 +3038,127 @@ msgstr "" ".óñåð ïåéñð\n" "\n" -#: src/url.c:676 +#: src/url.c:674 #, fuzzy msgid "No error" msgstr "ääåæî-éúìá äì÷ú" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "çøàî-áùçî ìù éåâù íù" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "" -#: src/url.c:686 +#: src/url.c:684 #, fuzzy msgid "Invalid user name" msgstr "çøàî-áùçî ìù éåâù íù" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr ".`--debug' ïééôàîá äëéîú íò äúðáð àì %s úéðëúä\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, fuzzy, c-format msgid "Continuing in background, pid %d.\n" msgstr ".ò÷øá êéùîî\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "`%s' éìåáîéñ øåùé÷ ú÷éçîá (%s) äì÷ú\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "%s-î øåùéà çúôî úìá÷á äì÷ú\n" +msgstr "%s-î (certificates) øåùéà úåéåú úðéòèá äì÷ú\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "`%s'-ì äáéúëá (%s) äì÷ú\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3266,12 +3236,6 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "èì÷ éðåúð åìá÷úä àì" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "éåâù Set-Cookie úøúåë ìù `%s' äãù" @@ -3294,6 +3258,12 @@ msgstr "" #~ msgid " [%s to go]" #~ msgstr " [%s ãåò øàùð]" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s úéðëú é\"ò øëåî åðéà `--%s' ïééôàî\n" + #~ msgid "Host not found" #~ msgstr "àöîð àì çøàî áùçî" diff --git a/po/hr.gmo b/po/hr.gmo index 5136f9b..9a9beab 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 339df3f..e923991 100644 --- a/po/hr.po +++ b/po/hr.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-02-18 13:29-0800\n" "Last-Translator: Božidar Putanec \n" "Language-Team: Croatian \n" @@ -35,7 +35,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.9\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nepoznata greÅ¡ka sustava" @@ -43,7 +43,7 @@ msgstr "Nepoznata greÅ¡ka sustava" msgid "Address family for hostname not supported" msgstr "Obitelj adresa za ime raÄunala nije podržana" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Privremena greÅ¡ka razluÄivanja imena" @@ -111,70 +111,45 @@ msgstr "Prekinut signalom" msgid "Parameter string not correctly encoded" msgstr "Parametar nije pravilno kodiran" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Nepoznata greÅ¡ka" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcija ‘%s’ je viÅ¡eznaÄna; mogućnosti:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcija ‘%s’ je viÅ¡eznaÄna\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcija ‘--%s’ ne dopuÅ¡ta argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opcija ‘%s’ je viÅ¡eznaÄna; mogućnosti:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nepoznata opcija ‘%c%s’\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcija ‘%c%s’ ne dopuÅ¡ta argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcija „--%s“ zahtijeva argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nepoznata opcija „--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nepoznata opcija ‘%c%s’\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neispravna opcija -- ‘%c’\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva argument -- „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcija „-W %s“ je viÅ¡eznaÄna\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcija „-W %s“ ne dopuÅ¡ta argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcija „-W %s“ zahtijeva argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -194,13 +169,13 @@ msgstr "%s: opcija „-W %s“ zahtijeva argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -272,28 +247,28 @@ msgstr "Regularni izraz je prevelik" msgid "Unmatched ) or \\)" msgstr "Manjka pȃr za: ) ili \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Nedostaje prethodni regularni izraz" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "ne mogu napraviti cijev" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s potproces nije uspio" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "‘_open_osfhandle’ nije uspio" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "ne mogu vratiti fd %d: dup2 nije uspio" @@ -312,51 +287,51 @@ msgstr "%s potproces je dobio fatalni signal %d" msgid "memory exhausted" msgstr "nema dovoljno memorije" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: ‘bind’ adresa %s ne može se razrijeÅ¡iti; ‘bind’ onesposobljen\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Spajanje na %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Spajanje na %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Spajanje na [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF nije uspjelo: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "spojen.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "neuspjeÅ¡no: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: adresa raÄunala %s ne može se razrijeÅ¡iti\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR nije uspjelo: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -392,174 +367,174 @@ msgstr "Nije moguće ukloniti %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "%s se ne može pohraniti kao %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Nije moguće dobiti kolaÄić za %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "GreÅ¡ka u sintaksi ‘Set-Cookie’: %s na poziciji %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "KolaÄić iz %s pokuÅ¡ao je postaviti domenu na" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Datoteku s kolaÄićima %s ne mogu otvoriti: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "GreÅ¡ka pisanja u %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "GreÅ¡ka zatvaranja %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Ova vrsta ftp ‘listing’ nije podržana, pokuÅ¡avam s Unix analizom.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks /%s na %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "vrijeme nepoznato " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Datoteka " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Direktorij " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Veza " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Neizvjesno " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtova)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Duljina: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) preostaje" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s preostaje" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (nemjerodavan)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL se ne može inicirati. Bit će onemogućen." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Prijavite se kao %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "GreÅ¡ka u odgovoru poslužitelja, kontrolna veza se zatvara.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "GreÅ¡ka u pozdravu poslužitelja.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Pisanje nije uspjelo, kontrolna veza se zatvara.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Poslužitelj odbija prijavu.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "NetoÄna prijava.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Prijavljen!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Poslužitelj nije prihvatio ‘PBSZ 0’ naredbu.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Poslužitelj nije prihvatio ‘PROT %c’ naredbu.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "GreÅ¡ka na poslužitelju, ne mogu otkriti vrstu sustava.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "gotovo. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "gotovo.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Nepoznata vrsta „%c“, kontrolna veza se zatvara.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "gotovo." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nije potreban.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Interna greÅ¡ka! Nemoguća sekcija dohvaćena u getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -570,7 +545,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -579,37 +554,37 @@ msgstr "" "Direktorij %s ne postoji.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nije potreban.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Datoteka je već preuzeta.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nije moguće zapoÄeti PASV prijenos.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Nije moguće obraditi PASV odgovor.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "nemoguće spajanje na %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "GreÅ¡ka povezivanja (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Neispravan PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -617,17 +592,17 @@ msgstr "" "\n" "REST nije uspio, zapoÄinje ispoÄetka.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Datoteka %s postoji.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Nema takve datoteke %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -636,7 +611,7 @@ msgstr "" "Nema takve datoteke %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -645,40 +620,40 @@ msgstr "" "Nema takve datoteke ili direktorija %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s se nenadano pojavio.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, kontrolna veza se zatvara.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Podatkovna veza: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Kontrolna veza je prekinuta.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Prijenos podataka je prekinut.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Datoteka %s već postoji; ponovno se ne preuzima.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(pok:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -687,7 +662,7 @@ msgstr "" "%s (%s) - zapisano na standardni izlaz %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -696,35 +671,35 @@ msgstr "" "%s (%s) - %s spremljeno [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Uklanja se %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "%s se koristi kao privremeni popis datoteka.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Uklonjeno %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Dubina rekurzije %d prelazi najveću dozvoljenu dubinu %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Datoteka na poslužitelju nije novija od lokalne datoteke %s\n" " -- ponovno se ne nepreuzima.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -733,7 +708,7 @@ msgstr "" "Datoteka na poslužitelju je novija od lokalne datoteke %s -- preuzima se.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -742,11 +717,11 @@ msgstr "" "VeliÄine se ne slažu (lokalno %s) -- preuzima se.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Neispravno ime simboliÄke veze, preskoÄena.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -755,239 +730,239 @@ msgstr "" "Već postoji ispravna simboliÄka veza %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Napravljena simboliÄka veza %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "SimboliÄke veze nisu podržane, preskoÄena veza %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "PreskoÄen direktorij %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: nepoznata ili nepodržana vrsta datoteke.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: neispravna vremenska oznaka.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Direktoriji neće biti uÄitani jer je dubina %d (maksimum %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ne silaziti u %s jer nije ukljuÄen ili je iskuljuÄen.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Odbijam %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "GreÅ¡ka usporeÄ‘ivanja %s sa %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Nema podudaranja s uzorkom %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Upisan HTML-iziran indeks u %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Upisan HTML-iziran indeks u %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "GREÅ KA: Direktorij %s se ne može otvoriti.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "GREÅ KA: Neuspjelo otvaranje certifikata %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "UÄitan CA certifikat ‘%s’\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "GREÅ KA: Neuspjeh pri uÄitavanju CRL datoteke ‘%s’: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "UÄitana CRL datoteka ‘%s’\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "GREÅ KA: GnuTLS zahtijeva da su kljuÄ i certifikat iste vrste.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: vrijednost %d opcije ‘secure-protocol’ nije implementiran\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Izvijestite o ovom problemu (na engleskom) na \n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: vrijednost %d opcije ‘secure-protocol’ nije implementiran\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "GREÅ KA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "UPOZORENJE" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nije predoÄio certifikat.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikat %s nije pouzdan.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certifikat %s nema poznatog izdavatelja.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikat %s je ukinut.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Potpisnik certifikata %s nije CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Certifikat %s potpisan je koristeći se nesigurnim algoritmom.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certifikat %s joÅ¡ nije aktiviran.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikat %s je istekao.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "GreÅ¡ka pri inicijaliziranju X509 certifikata: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Certifikat nije pronaÄ‘en\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "GreÅ¡ka pri obradi certifikata: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certifikat joÅ¡ nije aktiviran\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certifikat je istekao\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Vlasnik certifikata ne odgovara imenu raÄunala %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Javni kljuÄ se ne podudara s pohranjenim javnim kljuÄem!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certifikat mora biti X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "PogreÅ¡ka pri obradi popisa adresa.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Nepoznato raÄunalo" # resolving u ovom sluÄaju > traži ime raÄunala (host) -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Tražim %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "neuspjeh: Nema IPv4 ili IPv6 adresa za raÄunalo.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "neuspjeh: vrijeme je isteklo.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Nepotpuni ‘hyperlink’ %s se ne može razrijeÅ¡iti.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Neispravan URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "NeuspjeÅ¡no slanje HTTP zahtjeva: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Nema zaglavlja, pretpostavljam HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -996,11 +971,11 @@ msgstr "" "Datoteka %s već postoji; ponovno se ne preuzima.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "neuspjeh ‘gmtime’. Vjerojatno se radi o greÅ¡kici (bug).\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1009,55 +984,55 @@ msgstr "" "upisati\n" " kao zadnja izmjena\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Nedostaju podaci iz ‘BODY’ datoteke %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Nova uporaba postojeće veze prema [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Nova uporaba postojeće veze prema %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "NeuspjeÅ¡no Äitanje odgovora proxy poslužitelja: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s GREÅ KA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Deformirana status-vrpca" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "NeuspjeÅ¡no tuneliranje kroz ‘proxy’ poslužitelj: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Nepoznata metoda autentifikacije.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Odabrana autentifikacija: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Spremanje u: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1066,25 +1041,25 @@ msgstr "" "Pri preuzimanju potpisa:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Nemoguće je proÄitati sadržane potpise iz privremene datoteke. PreskoÄeno.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Nemoguće je napraviti privremenu datoteku. PreskoÄeno preuzimanje potpisa.\n" # Valid ranges for the "pri" attribute are from # 1 to 999999. Mirror servers with a lower value of the "pri" attribute have a higher priority -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Neispravna ‘pri’ vrijednost. Postavljena na %d.\n" # digest > hash -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1092,42 +1067,42 @@ msgstr "" "Nije moguće pronaći prihvatljivi kontrolni zbroj za Metalink resursa.\n" "Zanemaruje se.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL se iskljuÄuje zbog pronaÄ‘enih greÅ¡aka.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s zahtjev poslan, Äekanje odgovora... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Podaci nisu primljeni.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "GreÅ¡ka Äitanja (%s) u zaglavljima.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(bez opisa)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Položaj: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nedefinirano" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [pratim]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1136,7 +1111,7 @@ msgstr "" "Datoteka %s nije izmijenjena na poslužitelju. PropuÅ¡ta se preuzimanje.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1147,7 +1122,7 @@ msgstr "" "PokuÅ¡ajte dodati ‘--no-if-modified-since’ opciju.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1157,59 +1132,59 @@ msgstr "" " Datoteka je već u potpunosti preuzeta; nema posla.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Duljina: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "zanemareno" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozorenje: HTTP ne podržava viÅ¡eznaÄnike (wildcards).\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "‘Spider’ je omogućen. Provjerite postoji li datoteka na poslužitelju.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nije moguće pisati u %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Obvezni atribut nedostaje u preuzetom zaglavlju.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Autentifikacija korisnik/lozinka nije uspjela.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "U WARC datoteku se ne može pisati.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "U privremenu WARC datoteku se ne može pisati.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "SSL veza se ne može uspostaviti.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Veza %s (%s) se ne može ukloniti.\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "GREÅ KA: Preusmjeravanje (%d) bez cilja (adrese).\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1217,25 +1192,25 @@ msgstr "" "Nema Metalink podataka u HTTP odgovoru. Preuzimanje datoteke pomoću HTTP " "GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "NaÄ‘eno je Metalink zaglavlje. Prelazim na Metalink naÄin.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Datoteka ne postoji na poslužitelju -- neispravni ‘hyperlink’!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Nedostaje ‘Last-modified’ zaglavlje -- vremenske oznake su iskljuÄene.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Neispravno ‘Last-modified’ zaglavlje -- vremenska oznaka je zanemarena.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1245,16 +1220,16 @@ msgstr "" " -- ne preuzima se.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "VeliÄine se ne slažu (lokalno %s) -- preuzima se ponovno.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Datoteka na poslužitelju je novija, preuzima se ponovno.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1265,7 +1240,7 @@ msgstr "" " -- preuzima se.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1273,7 +1248,7 @@ msgstr "" "Datoteka na poslužitelju postoji ali nema nikakvih veza -- ne preuzima se.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1283,7 +1258,7 @@ msgstr "" "ali rekurzija je onemogućena -- ne preuzima se.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1291,12 +1266,12 @@ msgstr "" "Datoteka na poslužitelju postoji.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1305,7 +1280,7 @@ msgstr "" "%s (%s) - zapisano na standardni izlaz %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1314,59 +1289,59 @@ msgstr "" "%s (%s) - %s spremljeno [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Veza zatvorena na bajtu %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - GreÅ¡ka Äitanja na bajtu %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodržana kvaliteta zaÅ¡tite ‘%s’.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodržan algoritam ‘%s’.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC pokazuje na %s, a koji ne postoji.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ne mogu proÄitati %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: GreÅ¡ka u %s u retku %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: SintaktiÄka greÅ¡ka u %s u retku %d.\n" # c-format -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Nepoznata naredba %s u %s u retku %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1377,7 +1352,7 @@ msgstr "" " uspjela. Molim provjerite ‘%s’,\n" " ili navedite drugu datoteku opcijom --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1389,54 +1364,54 @@ msgstr "" " ili navedite drugu datoteku opcijom --config.\n" # c-format -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Upozorenje: wgetrc sustava i korisnika (oba) ukazuju na ‘%s’.\n" # c-format # %s: PogreÅ¡na naredba '%s' u '--execute'.\n -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: PogreÅ¡na naredba ‘%s’ u ‘--execute’.\n" # c-format -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Neispravna logiÄka varijabla %s; koristite „on“ ili „off“.\n" # c-format -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: %s je nevažeći; koristite „on“ , „off“, ili „quiet“.\n" # c-format -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neispravan broj %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s smije se samo jedanput upotrijebiti\n" # c-format -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neispravna vrijednost bajta %s\n" # c-format -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neispravan vremenski period %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1446,32 +1421,32 @@ msgstr "" "WGET_ASKPASS ili SSH_ASKPASS.\n" # c-format -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neispravna vrijednost %s.\n" # c-format -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neispravno zaglavlje %s.\n" # c-format -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neispravno WARC zaglavlje %s.\n" # c-format -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neispravna vrsta napretka %s.\n" # c-format -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1481,43 +1456,43 @@ msgstr "" " koristite [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" "\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodiranje %s nije ispravno\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Pretvaranje iz %s u %s nije podržano\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "PronaÄ‘en nepotpun ili neispravan viÅ¡ebajtni niz\n" # Weird, we got an unspecified error -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "NeobraÄ‘ena greÅ¡ka %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: ‘locale’ nije instaliran\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "‘idn_encode’ nije uspio (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "" "Nije uspjela konverzija na niže: %d: %s\n" "\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1528,88 +1503,88 @@ msgstr "" # log > bilježiti u dnevnik > dnevniÄiti # logging > dnevniÄenje -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; dnevniÄenje (bilježenje u dnevnik) je onemogućeno.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uporaba: %s [OPCIJA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "Obvezni argumenti dugaÄkih opcija obvezni su i za kratke opcije.\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Pokretanje:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version Wget inaÄica i dodatne obavijesti\n" "\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help ova prikazana pomoć\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background nakon pokretanja nastavi rad u pozadini\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=NAREDBA izvrÅ¡i naredbu (NAREDBA je u „.wgetrc“ " "stilu)\n" # Logging and Input File Options -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "DnevniÄka (dnevnik) i ulazna datoteka:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=DNEVNIK poruke bilježiti u DNEVNIK\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" " -a, --append-output=DNEVNIK poruke dopisivati na kraj DNEVNIKA\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug ispiÅ¡i puno podataka za debugiranje\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug ispiÅ¡i Watt-32 poruke za debugiranje\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tihi rad (bez ispisa)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose opÅ¡iran ispis (zadano)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose neopÅ¡iran ispis, ali ne i tiho\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1617,7 +1592,7 @@ msgstr "" " --report-speed=VRSTA VRSTA je Å¡irina pojasa. VRSTA može biti " "bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1625,7 +1600,7 @@ msgstr "" " -i, --input-file=DATOTEKA preuzmi URL-ove navedene u DATOTECI\n" " (lokalna ili vanjska DATOTEKA)\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1633,12 +1608,12 @@ msgstr "" " --input-metalink=DATOTEKA preuzmi URL-ove navedene u lokalnoj\n" " Metalink DATOTECI\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html tretiraj ulaznu datoteku kao HTML\n" # Resolves relative links using URL as the point of reference, when reading links from an HTML file specified via the ‘-i’/‘--input-file’ option (together with ‘--force-html’) -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1648,28 +1623,28 @@ msgstr "" " razrijeÅ¡i koristeći URL kao " "referenciju\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=DATOTEKA DATOTEKA sa zadanom konfiguracijom\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config ignoriraj sve datoteke s konfiguracijom\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=DATOTEKA razloge za odbijanje URL bilježiti u " "DATOTEKU\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Preuzimanje:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1677,17 +1652,17 @@ msgstr "" " -t, --tries=BROJ BROJ pokuÅ¡aja preuzimanja (0 bez " "ograniÄenja)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused ponovi pokuÅ¡aj iako je spajanje odbijeno\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=DATOTEKA dokumente spremaj u DATOTEKU\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1695,7 +1670,7 @@ msgstr "" " -nc, --no-clobber preskoÄi preuzimanja koja bi mogla\n" " prebrisati postojeće datoteke\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1703,7 +1678,7 @@ msgid "" msgstr "" " --no-config ignoriraj sve datoteke s konfiguracijom\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1711,7 +1686,7 @@ msgstr "" " -c, --continue nastavi s preuzimanjem djelomiÄno\n" " preuzete datoteke\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1719,19 +1694,19 @@ msgstr "" " --start-pos=POZICIJA zapoÄni preuzimanje od POZICIJE (0 = " "poÄetak)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=VRSTA VRSTA je indikator progresa preuzimanja\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" " --show-progress progres preuzimanja je uvijek vidljiv\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1742,7 +1717,7 @@ msgstr "" # ‘--no-if-modified-since’ # Do not send If-Modified-Since header in ‘-N’ mode. Send preliminary HEAD request instead. This has only effect in ‘-N’ mode. -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1751,7 +1726,7 @@ msgstr "" " --no-if-modified-since ne koristi uvjet ‘if-modified-since’\n" " zajedno s ‘--timestamping’ opcijom\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1760,22 +1735,22 @@ msgstr "" "datoteke\n" " s poslužitelja na lokalnu datoteku\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response prikaži odgovor poslužitelja\n" # Wget will behave as a Web spider, which means that it will not download the pages, just check that they are there -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ne preuzimaj niÅ¡ta\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDS sva tajmaut vremena postavi na\n" " SECONDS sekundi\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1783,7 +1758,7 @@ msgstr "" " --dns-servers=ADRESE popis DNS poslužitelja za " "propitkivanje (rastavljeni zarezima)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1792,31 +1767,31 @@ msgstr "" "IP) lokalnog raÄunala\n" # timeout > vremensko ograniÄenje -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECS ograniÄi DNS-ov tajmaut za odgovor\n" " na SECS sekundi\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECS ograniÄi tajmaut za spajanje na SECS " "sekundi\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECS ograniÄi tajmaut za Äitanje\n" " na SECS sekundi\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=VRIJEME priÄekaj VRIJEME sekunda izmeÄ‘u " "preuzimanja\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1824,7 +1799,7 @@ msgstr "" " --waitretry=VRIJEME pauza 1..VRIJEME sekundi izmeÄ‘u\n" " pokuÅ¡aja preuzimanja\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1833,18 +1808,18 @@ msgstr "" " izmeÄ‘u pokuÅ¡aja preuzimanja\n" # Don’t use proxies, even if the appropriate *_proxy environment variable is defined. -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ne koristi proxy poslužitelje\n" # The value can be specified in bytes (default), kilobytes (with ‘k’ suffix), or megabytes (with ‘m’ suffix). -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=BROJ kvota preuzimanja ograniÄena na BROJ\n" " (bajta, k Kilobajta, m Megabajta)\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1853,18 +1828,18 @@ msgstr "" " (ime raÄunala ili IP)\n" # Limit the download speed to no more than rate bytes per second. -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=BRZINA brzina preuzimanja je ograniÄena na " "BRZINU\n" " bajta po sekundi\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache ne pamti rezultate DNS upita\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1872,7 +1847,7 @@ msgstr "" " --restrict-file-names=OS znakove u nazivima datoteka ograniÄi na\n" " one koji su dopuÅ¡teni u navedenom OS-u\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1880,16 +1855,16 @@ msgstr "" " --ignore-case zanemari veliÄinu slova pri traženju\n" " datoteka ili direktorija\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only spajaj se samo na IPv4 adrese\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only spajaj se samo na IPv6 adrese\n" # ‘--prefer-family=none/IPv4/IPv6’ -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1899,20 +1874,20 @@ msgstr "" "vrste;\n" " VRSTA je jedna od IPv6, IPv4 ili none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=KORISNIK http i ftp korisnik je KORISNIK\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=LOZINKA http i ftp lozinka je LOZINKA\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pitaj za lozinku\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1930,29 +1905,29 @@ msgstr "" "SSH_ASKPASS \n" " rabi okoliÅ¡nu varijablu.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri iskljuÄi IRI podrÅ¡ku\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KÔD koristi KÔD kao IRI lokalno kodiranje\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KÔD koristi KÔD kao zadano udaljeno " "kodiranje\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink ukloni datoteke prije prepisivanja\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1962,7 +1937,7 @@ msgstr "" " (pridodaj ." "badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1970,7 +1945,7 @@ msgstr "" " --metalink-index=BROJ Redni BROJ metalink aplikacije/" "metalink4+xml metaurl\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1979,7 +1954,7 @@ msgstr "" "zaglavlja\n" " HTTP-ovog odgovora\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1987,7 +1962,7 @@ msgstr "" " --preferred-location poželjna lokacija za Metalink resurse\n" # Globbing refers to the use of shell-like special characters (wildcards), like ‘*’, ‘?’, ‘[’ and ‘]’ to retrieve more than one file from the same directory at once. -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1995,33 +1970,33 @@ msgstr "" " --no-xattr iskljuÄi pohranu meta podataka u " "proÅ¡irene atribute datoteka\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Direktoriji:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne pravi direktorije\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories prinudno pravi direktorije\n" # Disable generation of host-prefixed directories -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ne pravi direktorije poslužitelja\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories koristi ime protokola u direktorijima\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIKS spremi datoteke u PREFIKS/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2029,27 +2004,27 @@ msgstr "" " --cut-dirs=BROJ zanemari BROJ razina putanje " "poslužitelja\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP opcije:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=KORISNIK http korisnik je KORISNIK\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=LOZINKA http lozinka je LOZINKA\n" # Disable server-side cache. In this case, Wget will send the remote server an appropriate directive (‘Pragma: no-cache’) to get the file from the remote service, rather than returning the cached version. This is especially useful for retrieving and flushing out-of-date documents on proxy servers. -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache sprijeÄi preuzimanje ‘cached’ datoteka\n" " s poslužitelja\n" # Use name as the default file name when it isn’t known (i.e., for URLs that end in a slash), instead of index.html. -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2057,7 +2032,7 @@ msgstr "" " --default-page=IME promijeni zadano ime stranice na IME\n" " (to je obiÄno ‘index.html’)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2065,19 +2040,19 @@ msgstr "" " -E, --adjust-extension spremi HTML/CSS dokumente s ispravnim\n" " sufiksima\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length zanemari ‘Content-Length’ polje " "zaglavlja\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=NIZ umetni znakovni NIZ meÄ‘u zaglavlja\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2085,24 +2060,24 @@ msgid "" msgstr "" " --progress=VRSTA VRSTA je indikator progresa preuzimanja\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalni broj preusmjeravanja\n" " dopuÅ¡tenih po stranici\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=KORISNIK korisnik proxy poslužitelja je KORISNIK\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=LOZINKA lozinka proxy poslužitelja je LOZINKA\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2110,11 +2085,11 @@ msgstr "" " --referer=URL ukljuÄi ‘Referer: URL’ zaglavlje\n" " u HTTP zahtjev\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers spremi HTTP zaglavlja u datoteku\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2122,7 +2097,7 @@ msgstr "" " -U, --user-agent=AGENT identificiraj se kao AGENT umjesto\n" " kao Wget/INAÄŒICA\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2130,23 +2105,23 @@ msgstr "" " --no-http-keep-alive onemogući HTTP keep-alive (postojanu " "vezu)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne koristi kolaÄiće\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=DATOTEKA prije sesije uÄitaj kolaÄiće iz DATOTEKE\n" # ali ne i „session cookies“ -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=DATOTEKA nakon sesije spremi kolaÄiće u DATOTEKU\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2154,28 +2129,28 @@ msgstr "" " --keep-session-cookies uÄitaj i spremi kolaÄiće (privremene) " "sesije\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=NIZ POST metodom poÅ¡alji NIZ kao podatke\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=DATOTEKA POST metodom poÅ¡alji sadržaj iz DATOTEKE\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod upotrijebi metodu „HTTPMethod“ u " "zaglavlju\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2183,7 +2158,7 @@ msgstr "" " --body-data=TEKST poÅ¡alji TEKST kao podatke.\n" " Opcija ‘--method’ MORA se upotrijebiti\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2191,7 +2166,7 @@ msgstr "" " --body-file=DATOTEKA poÅ¡alji sadržaj iz DATOTEKE.\n" " Opcija ‘--method’ MORA se upotrijebiti\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2204,7 +2179,7 @@ msgstr "" " (EKSPERIMENTALNO)\n" # If this is set to on, wget will not skip the content when the server responds with a http status code that indicates error. -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2212,7 +2187,7 @@ msgstr "" " --content-on-error prihvati primljeni sadržaj iako\n" " poslužitelj javlja greÅ¡ku\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2223,11 +2198,11 @@ msgstr "" "poÅ¡alji\n" " bez Äekanja na upit na poslužitelja\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) opcije:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2237,41 +2212,41 @@ msgstr "" " --secure-protocol=PR izaberi sigurnosni protokol, jedan od\n" " auto, SSLv2, SSLv3 ili TLSv1\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only prati samo sigurne HTTPS veze\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ne provjeravaj certifikat poslužitelja\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DATOTEKA DATOTEKA sa certifikatom klijenta\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=VRSTA VRSTA certifikata klijenta, PEM ili DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DATOTEKA DATOTEKA s privatnim kljuÄem\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=VRSTA VRSTA privatnog kljuÄa, PEM ili DER\n" # CA > certificate authorities -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DATOTEKA DATOTEKA sadrži listu CA-ova\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2279,11 +2254,11 @@ msgstr "" " --ca-directory=DIR direktorij u kojem su pohranjeni CA-ovi\n" # CRL > Certificate Revocation List -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DATOTEKA DATOTEKA sadrži listu CRL-ova\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2300,7 +2275,7 @@ msgstr "" " peer against\n" # Pseudo-Random Number Generator > PRNG -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2312,7 +2287,7 @@ msgstr "" " brojeva)\n" # EGD: the Entropy Gathering Daemon -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2321,12 +2296,12 @@ msgstr "" "nasumiÄnim\n" " podacima\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HTTP opcije:\n" # HSTS (HTTP Strict Transport Security, RFC 6797) -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" " --no-hsts ne koristi HSTS\n" @@ -2334,7 +2309,7 @@ msgstr "" # ‘--hsts-file=file’ # By default, Wget stores its HSTS database in ~/.wget-hsts. You can use ‘--hsts-file’ to override this. Wget will use the supplied file as the HSTS database. -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2342,11 +2317,11 @@ msgstr "" " --hsts-file=DATOTEKA DATOTEKA je HSTS baza podataka (ukida " "zadanu)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP opcije:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2355,37 +2330,37 @@ msgstr "" "FTP\n" " datoteke\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=KORISNIK ftp korisnik je KORISNIK\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=LOZINKA ftp lozinka je LOZINKA\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne uklanjaj ‘.listing’ datoteke\n" # Globbing refers to the use of shell-like special characters (wildcards), like ‘*’, ‘?’, ‘[’ and ‘]’ to retrieve more than one file from the same directory at once. -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob ne koristi viÅ¡eznaÄnike za nazive\n" " FTP datoteka\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp onemogući „pasivni“ naÄin prijenosa\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions oÄuvaj dopuÅ¡tanja udaljene datoteke\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2393,11 +2368,11 @@ msgstr "" " --retr-symlinks pri rekurziji, preuzmi datoteke na koje\n" " pokazuju veze (ali ne direktorije)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS opcije:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2406,7 +2381,7 @@ msgstr "" " (zadani port je 990)\n" "\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2416,7 +2391,7 @@ msgstr "" " kontrolnom kanalu pri otvaranju\n" " podatkovnog kanala\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2424,7 +2399,7 @@ msgstr "" " --ftps-clear-data-connection samo je kontrolni kanal Å¡ifriran;\n" " podaci se ne Å¡ifriraju\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2432,11 +2407,11 @@ msgstr "" " --ftps-fallback-to-ftp koristi FTP ako ciljani poslužitelj\n" " ne podržava FTPS\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC opcije:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2444,23 +2419,23 @@ msgstr "" " --warc-file=DATOTEKA spremi podatke o zahtjevima i odgovorima\n" " u .warc.gz DATOTEKU\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=NIZ umetni znakovni NIZ u warcinfo zapis\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=BROJ maksimalna veliÄina WARC datoteke = BROJ\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx piÅ¡i CDX datoteke indeksa.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2469,16 +2444,16 @@ msgstr "" "DATOTEKE\n" "\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression ne sažimaj WARC datoteke s GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ne raÄunaj SHA1 kontrolne sume\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2486,7 +2461,7 @@ msgstr "" " --no-warc-keep-log ne spremaj dnevniÄku datoteku (dnevnik)\n" " u WARC zapis\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2495,15 +2470,15 @@ msgstr "" " --warc-tempdir=DIREKTORIJ DIREKTORIJ za privremene WARC-ove " "datoteke\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekurzivno preuzimanje:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekurzivno preuzimanje.\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2512,7 +2487,7 @@ msgstr "" " (inf ili 0 za neograniÄenu dubinu)\n" # Note that ‘--delete-after’ deletes files on the local machine. -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2521,7 +2496,7 @@ msgstr "" " na lokalnom raÄunalu\n" # After the download is complete, convert the links in the document to make them suitable for local viewing -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2531,7 +2506,7 @@ msgstr "" "u\n" " tako da ukazuju na lokalne datoteke\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2540,7 +2515,7 @@ msgstr "" " (inaÄe znan kao " "osnovno ime)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2549,7 +2524,7 @@ msgstr "" "N\n" " sigurnosnih kopija\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2557,7 +2532,7 @@ msgstr "" " -K, --backup-converted prije pretvaranja datoteke X, spremi\n" " njenu kopiju kao X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2565,7 +2540,7 @@ msgstr "" " -K, --backup-converted prije pretvaranja datoteke X,\n" " spremi njenu kopiju kao X_orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2573,7 +2548,7 @@ msgstr "" " -m, --mirror parametar ekvivalentan izrazu:\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2581,7 +2556,7 @@ msgstr "" " -p, --page-requisites preuzmi sve slike i sve Å¡to je potrebno\n" " za prikaz HTML stranice\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2589,13 +2564,13 @@ msgstr "" " --strict-comments HTML komentare strogo obraditi\n" " u skladu sa SGML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekurzivno prihvaćanje/odbijanje:\n" # Specify comma-separated lists of file name suffixes or patterns to # accept or reject {Types of Files}). -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2606,7 +2581,7 @@ msgstr "" # Specify comma-separated lists of file name suffixes or patterns to # accept or reject {Types of Files}). -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2614,48 +2589,48 @@ msgstr "" " -R, --reject=POPIS zarezom odvojen POPIS odbijenih sufiksa\n" # REGIZR, zaÅ¡to ne REGIZ, kraće i lakÅ¡e izgovoriti; ili jednostavno prihvatiti regex! -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGIZ regularni izraz REGIZ poduraran s\n" " prihvaćenim URL-ovima\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGIZ regularni izraz REGIZ podudaran s\n" " odbijenim URL-ovima.\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=VRSTA VRSTA regularnog izraza (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=VRSTA VRSTA regularnog izraza (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=POPIS zarezom odvojen POPIS prihvaćenih " "domena\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=POPIS zarezom odvojen POPIS iskljuÄenih " "domena\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp prati FTP veze iz HTML dokumenata\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2663,7 +2638,7 @@ msgstr "" " --follow-tags=POPIS zarezom odvojen POPIS praćenih HTML " "tagova\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2671,21 +2646,21 @@ msgstr "" " --ignore-tags=POPIS zarezom odvojen POPIS zanemarenih\n" " HTML tagova\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts tijekom rekurzije posjeti i\n" " strane poslužitelje\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative prati samo relativne veze\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=POPIS POPIS dopuÅ¡tenih direktorija\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2694,88 +2669,88 @@ msgstr "" " --trust-server-names koristi ime navedeno u zadnjoj\n" " komponenti URL preusmjerenja\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=POPIS POPIS iskljuÄenih direktorija\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ne ulazi u naddirektorij\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "GreÅ¡kice (bugs) i prijedloge (na engleskom) javite na \n" "PogreÅ¡ke u prijevodu i vaÅ¡e prijedloge javite na \n" "\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, program za neinteraktivno preuzimanje s mreže.\n" "\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Lozinka za korisnika %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Lozinka: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Ne mogu napraviti cijev\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "PogreÅ¡ka pri inicijalizaciji procesa (spawn file actions) za ‘use-askpass’: " "%d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "PogreÅ¡na postavka procesa (spawn file actions) za ‘use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "PogreÅ¡ka pri Äitanju odgovora naredbe „%s %s“: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Korisnik (ime) za ‘%s%s’: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Lozinka za korisnika ‘%s%s@%s’: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompiliranje: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Povezivanje: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2784,29 +2759,29 @@ msgstr "" "GNU Wget %s izgraÄ‘en na %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (okolina)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (korisnik)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sustav)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2820,7 +2795,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2828,41 +2803,41 @@ msgstr "" "\n" "Izvorno napisao Hrvoje NikÅ¡ić .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "GreÅ¡kice (bugs) i vaÅ¡a pitanja (na engleskom) javite na .\n" "PogreÅ¡ke u prijevodu i vaÅ¡e prijedloge javite na \n" "\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problem dodjele memorije\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Prekid rada zbog greÅ¡ke u %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "„%s --help“ za pomoć i dodatne opcije.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nedozvoljena opcija -- „-n%c“\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "PodrÅ¡ka za debugiranje nije ugraÄ‘ena (kompilirana).\n" "--debug parametar je zanemaren\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2871,7 +2846,7 @@ msgstr "" "Navedene su istovremeno opcije --no-clobber i --convert-links;\n" "--no-clobber se zanemaruje\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2880,25 +2855,25 @@ msgstr "" "Navedene su istovremeno opcije --no-clobber i --convert-file-only ;\n" " samo --convert-file-only će se koristiti.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" "Istovremeno se ne može biti opÅ¡iran i tih.\n" "n\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Istovremeno se ne može oznaÄiti vrijeme a pritom ne brisati stare datoteke.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Opcije --inet4-only i --inet6-only ne smiju se zajedno navesti.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2910,7 +2885,7 @@ msgstr "" "ili u kombinaciji sa -p ili -r. Pogledajte upute za viÅ¡e pojedinosti.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2920,7 +2895,7 @@ msgstr "" "spremljen u jednu datoteku koju ste naveli.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2930,18 +2905,13 @@ msgstr "" "Pogledajte upute za viÅ¡e pojedinosti.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Datoteka „%s“ već postoji; ponovno se ne preuzima.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "WARC izlaz ne radi uz ‘--no-clobber’; ‘no-clobber se onemogućuje’ .\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2949,12 +2919,12 @@ msgstr "" "WARC izlaz ne radi s vremenskim oznakama; vremensko oznaÄavanje se " "onemogućuje.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC izlaz ne radi uz ‘--spider’ opciju.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2964,7 +2934,7 @@ msgstr "" "onemogućuju.\n" # In computing, data deduplication is a specialized data compression technique for eliminating duplicate copies of repeating data. Related and somewhat synonymous terms are intelligent (data) compression and single-instance (data) storage. -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2972,7 +2942,7 @@ msgstr "" "WARC-kontrolni zbrojevi su onemogućeni; WARC deduplikacija neće pronaći " "duplikate zapisa.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2981,12 +2951,12 @@ msgstr "" "WARC izlaz ne radi uz ‘--continue’ ili ‘--start-pos’; obje opcije se " "onemogućuju.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Istovremeno se ne smije upotrijebiti --ask-password i --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2995,17 +2965,17 @@ msgstr "" "Istovremena upotreba --start-pos i --continue se ne preporuÄuje;\n" " --continue se onesposobljuje.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: nedostaje URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ne možete upotrijebiti --post-data i --post-file istovremeno.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3014,7 +2984,7 @@ msgstr "" "Ne smije se upotrijebiti --post-data ili --post-file zajedno s --method.\n" " --method oÄekuje --body-data i --body-file opcije\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3023,24 +2993,24 @@ msgstr "" "Metodu morate navesti s --method=HTTPMethod za upotrebu s --body-data\n" " ili --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Istovremeno se ne smije navesti --body-data i --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ova inaÄica nema podrÅ¡ku za IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k ili -r može se koristiti sa -O samo kod ispisa u regularnu datoteku.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3049,42 +3019,42 @@ msgstr "" "--convert-links or --convert-file-only mogu se koristiti samo za ispis u " "regularnu datoteku.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Nije uspjelo inicijalizirati ‘libcares’\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nije uspjelo inicijalizirati ‘c-ares’ kanal\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Nije uspjelo razrijeÅ¡iti IP adresu ‘%s’\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Nije uspjelo postaviti DNS poslužitelj(e) '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nijedan URL nije pronaÄ‘en u %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Metalink datoteka %s ne može se raÅ¡Älaniti.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Svi resursi iz %s nisu se mogli preuzeti.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3095,7 +3065,7 @@ msgstr "" "Ukupno vrijeme od poÄetka: %s\n" "Preuzeto: %d datoteka, %s u %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "OgraniÄenje preuzimanja od %s je PREKORAÄŒENO!\n" @@ -3251,111 +3221,111 @@ msgstr "Datoteka %s je uÄitana, ali potpis se ne podudara. \n" msgid "Renaming %s to %s.\n" msgstr "Preimenujem %s u %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Nastavljam raditi u pozadini.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Nastavljam raditi u pozadini, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Izlazni podaci bit će spremljeni u %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "pogreÅ¡ka u fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "pogreÅ¡ka u fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nije moguće pronaći upotrebljiv upravljaÄ (driver) utiÄnice.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "pogreÅ¡ka u ioctl(). UtiÄnica se ne može postaviti da blokira.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: upozorenje: simbol %s se pojavljuje prije bilo kojeg imena " "raÄunala\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nepoznat simbol „%s“\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uporaba: %s NETRC [RAÄŒUNALO]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ne može se dobiti ‘stat’ %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" "UPOZORENJE: generator sluÄajnih brojeva iniciran je sa slabim sjemenom.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "PRNG (generator pseudo sluÄajnih brojeva nije iniciran;\n" " razmislite o koriÅ¡tenju opcije --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "VaÅ¡a OpenSSL inaÄica je prestara i ne podržava TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "VaÅ¡a OpenSSL inaÄica je prestara i ne podržava TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: vrijednost opcije %d „secure-protocol“ nije implementiran\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: nije moguće provjeriti %s-ovog certifikata, koji je izdao %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Nema mogućnosti lokalno provjeriti autoritet izdavatelja.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " PronaÄ‘en samopotpisan certifikat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Izdani certifikat joÅ¡ nije valjan.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Izdani certifikat je istekao.\n" # nitko od alternativnih naziva navedenih u certifikatu # odgovara traženom ime domaćina abc -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3364,7 +3334,7 @@ msgstr "" "%s: nijedan od alternativnih naziva navedenih u certifikatu ne odgovara\n" " traženom imenu raÄunala %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3372,7 +3342,7 @@ msgstr "" " %s: ‘common name’ certifikata %s ne odgovara traženom imenu raÄunala " "%s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3383,12 +3353,12 @@ msgstr "" " To može biti znak da raÄunalo nije ono za koje se predstavlja\n" " (to jest, da nije stvarni %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Za nesigurno povezivanje na %s koristite „--no-check-certificate“.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3397,7 +3367,7 @@ msgstr "" "\n" "%*s[ preskaÄem %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3407,21 +3377,21 @@ msgstr "" # # FIXME: this is not "ETA" but simply "still %s" or "%s remaining" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " joÅ¡ %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " u " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Frekvencija ‘REALTIME clock’ se ne može odrediti: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "%s bit će uklonjen, jer je trebao biti odbijen.\n" @@ -3435,22 +3405,22 @@ msgstr "%s se ne može otvoriti: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "UÄitava se robots.txt; molim zanemarite greÅ¡ke.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "GreÅ¡ka pri obradi URL-a proxy poslužitelja %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "GreÅ¡ka u URL-u proxy poslužitelja %s: Mora biti HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d: prekoraÄen je broj preusmjerenja.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3458,7 +3428,7 @@ msgstr "" "Odustajem.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3466,127 +3436,127 @@ msgstr "" "PokuÅ¡avam ponovo.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Nema greÅ¡ke" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nepodržana shema %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Nedostaje shema" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Neispravno ime raÄunala" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Neispravan broj porta" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Neispravno korisniÄko ime" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Nepotpuna IPv6 numeriÄka adresa" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adrese nisu podržane" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Neispravna IPv6 numeriÄka adresa" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS podrÅ¡ka nije ukljuÄena pri kompiliranju" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "PronaÄ‘en nepotpun ili neispravan viÅ¡ebajtni niz\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Nije uspjelo dodijeliti dosta memorije; nema dovoljno memorije.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Nije uspjelo dodijeliti %ld bajtova; nema dovoljno memorije.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: meÄ‘uspremnik teksta je prevelik (%d bajtova), proces prekinut.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Nastavljam rad u pozadini, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nije uspjelo ukloniti simboliÄku vezu %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Nije uspjelo inicijalizirati ‘libcares’\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Nije uspjelo razrijeÅ¡iti IP adresu ‘%s’\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Nije uspjelo postaviti dopuÅ¡tenja za %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Neispravan regularni izraz %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "GreÅ¡ka pri traženju %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3671,6 +3641,24 @@ msgstr "" "PronaÄ‘eno toÄno podudaranje u CDX datoteci. PronaÄ‘eni zapis spremljen u " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: opcija ‘--%s’ ne dopuÅ¡ta argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: nepoznata opcija „--%s“\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: opcija „-W %s“ je viÅ¡eznaÄna\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opcija „-W %s“ ne dopuÅ¡ta argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: opcija „-W %s“ zahtijeva argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Datoteka „%s“ već postoji; ponovno se ne preuzima.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/hu.gmo b/po/hu.gmo index fba97ad..28bbe2f 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 5090f12..b3155b7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2016-06-19 17:43+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -21,7 +21,7 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -29,7 +29,7 @@ msgstr "Ismeretlen rendszerhiba" msgid "Address family for hostname not supported" msgstr "A gépnév címcsaládja nem támogatott" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Ãtmeneti névfeloldási hiba" @@ -97,70 +97,45 @@ msgstr "Egy szignál megszakította" msgid "Parameter string not correctly encoded" msgstr "A paraméter-karakterlánc kódolása nem megfelelÅ‘" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű; a lehetÅ‘ségek:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a(z) „--%s†kapcsoló nem enged meg argumentumot\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű; a lehetÅ‘ségek:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: a(z) „%c%s†kapcsoló ismeretlen\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a(z) „%c%s†kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a(z) „%s†kapcsolóhoz argumentum szükséges\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: a(z) „--%s†kapcsoló ismeretlen\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: a(z) „%c%s†kapcsoló ismeretlen\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a kapcsoló egy argumentumot igényel -- „%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a „-W %s†kapcsoló nem enged meg argumentumot\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a „-W %s†kapcsolóhoz argumentum szükséges\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -180,13 +155,13 @@ msgstr "%s: a „-W %s†kapcsolóhoz argumentum szükséges\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -259,28 +234,28 @@ msgstr "A reguláris kifejezés túl nagy" msgid "Unmatched ) or \\)" msgstr "Pár nélküli ) vagy \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Nincs elÅ‘zÅ‘ reguláris kifejezés" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "nem hozható létre adatcsatorna" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s alfolyamat sikertelen" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "az _open_osfhandle meghiúsult" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "a(z) %d fájlleíró nem állítható vissza: a dup2 sikertelen" @@ -299,51 +274,51 @@ msgstr "%s alfolyamat végzetes szignált (%d) kapott" msgid "memory exhausted" msgstr "elfogyott a memória" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: a bind cím (%s) nem oldható fel; a bind le lesz tiltva.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Csatlakozás a következÅ‘höz: %s[%s]:%d… " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Csatlakozás a következÅ‘höz: %s:%d… " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Csatlakozás a következÅ‘höz: [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "kapcsolódva.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "sikertelen: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: a gépcím (%s) nem oldható fel\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -377,177 +352,177 @@ msgstr "%s nem törölhetÅ‘: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "%s nem menthetÅ‘ mint %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Nem kérhetÅ‘ le süti ehhez: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Szintaktikai hiba a Set-Cookie-ban: %s a(z) %d pozíciónál.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" "A(z) %s helyrÅ‘l érkezÅ‘ süti megkísérelte a tartományt a következÅ‘re " "állítani: " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Nem lehet megnyitni a sütifájlt (%s): %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Hiba %s írása közben: %s.\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Hiba %s bezárásakor: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Nem támogatott listatípus, a Unix listaértelmezÅ‘ kerül felhasználásra.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s tartalma %s:%d-n" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "idÅ‘ ismeretlen " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fájl " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Könyvtár " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Nem biztos " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bájt)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Hossz: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) van hátra" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s van hátra" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (nem hiteles)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Az SSL elÅ‘készítése nem sikerült, ki lesz kapcsolva." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Belépés mint %s … " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Hiba a kiszolgáló válaszában, vezérlÅ‘kapcsolat lezárása.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Hiba a kiszolgáló üdvözlésében.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Ãrás sikertelen, vezérlÅ‘kapcsolat bezárva.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "A kiszolgáló visszautasítja a belépést.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "A belépés helytelen.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Belépve!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "A kiszolgáló nem fogadta el a „PBSZ 0†parancsot.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "A kiszolgáló nem fogadta el a „PROT %c†parancsot.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Kiszolgálóhiba, a rendszer típusa nem határozható meg.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "kész. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "kész.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Ismeretlen típus: „%câ€, a vezérlÅ‘kapcsolat lezárásra kerül.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "kész. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nem szükséges.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Logikailag lehetetlen szakasz elérve a getftp()-ben" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -558,7 +533,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -567,37 +542,37 @@ msgstr "" "Nincs ilyen könyvtár: %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nem szükséges.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "A fájl már le van töltve.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nem kezdeményezhetÅ‘ PASV átvitel.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "A PASV válasz nem dolgozható fel.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "nem lehet csatlakozni %s %d. portjához: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Hozzárendelési hiba (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Érvénytelen PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,19 +580,19 @@ msgstr "" "\n" "REST sikertelen, kezdés elölrÅ‘l.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" "A fájl (%s) létezik.\n" "\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Nincs ilyen fájl: %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -626,7 +601,7 @@ msgstr "" "Nincs ilyen fájl: %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -635,40 +610,40 @@ msgstr "" "Nincs ilyen fájl vagy könyvtár: %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s létrejött.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, vezérlÅ‘kapcsolat lezárása.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) -- Adatkapcsolat: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "VezérlÅ‘kapcsolat lezárva.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Adatátvitel megszakítva.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "A fájl (%s) már megvan, nem kerül letöltésre.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -677,7 +652,7 @@ msgstr "" "%s (%s) -- szabványos kimenetre mentve %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -686,33 +661,33 @@ msgstr "" "%s (%s) -- %s mentve [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "%s eltávolítása.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "%s kerül felhasználásra felsorolási átmeneti fájlként.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s eltávolítva.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "A(z) %d rekurziós mélység túllépte a maximális %d mélységet.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "A távoli fájl nem újabb a helyi %s fájlnál -- nem kerül letöltésre.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -721,7 +696,7 @@ msgstr "" "A távoli fájl újabb a helyi %s fájlnál -- letöltésre kerül.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -730,11 +705,11 @@ msgstr "" "A méretek nem egyeznek (a helyi: %s) -- letöltésre kerül.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "A szimbolikus link neve érvénytelen, kihagyás.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -743,241 +718,241 @@ msgstr "" "Már létezik a helyes %s → %s szimbolikus link\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "A(z) %s → %s szimbolikus link létrehozása\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "A szimbolikus linkek nem támogatottak, a(z) %s szimbolikus link kihagyva.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "A könyvtár (%s) kihagyása.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: ismeretlen/nem támogatott fájltípus.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nem kérhetÅ‘ le süti ehhez: %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: sérült idÅ‘pecsét.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "A könyvtárak letöltése kihagyva, mivel a mélység %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" "A következÅ‘be belépés kihagyva: %s, mert ki van zárva/nincs kijelölve.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s visszautasítása.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Hiba %s és %s illesztésekor: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Nincs találat a mintához (%s).\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "A HTML-esített index kiírva a fájlba (%s[%s]) fájlba.\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "A HTML-esített index kiírva a fájlba (%s).\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "HIBA: Nem lehet megnyitni a(z) %s könyvtárat.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "HIBA: a tanúsítvány (%s) megnyitása sikertelen: %d.\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "A hitelesítésszolgáltatói tanúsítvány („%sâ€) betöltve\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" "HIBA: a tanúsítvány-visszavonási fájl („%sâ€) betöltése sikertelen: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "A(z) „%s†tanúsítvány-visszavonási fájl betöltve\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "HIBA: A GnuTLS azonos típusú kulcsot és tanúsítványt igényel.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: megvalósítatlan „secure-protocol†beállításérték: %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Jelentse ezt a problémát a bug-wget@gnu.org címen\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: megvalósítatlan „secure-protocol†beállításérték: %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "HIBA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "FIGYELMEZTETÉS" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nem mutatott be tanúsítványt.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s tanúsítványa nem megbízható.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: %s tanúsítványának nincs ismert kibocsátója.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s tanúsítványát visszavonták.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s tanúsítványát nem egy hitelesítésszolgáltató írta alá.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: %s tanúsítványát nem biztonságos algoritmussal írták alá.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s tanúsítványa még nincs aktiválva.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s tanúsítványa lejárt.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Hiba az X509 tanúsítvány elÅ‘készítésekor: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Nem található tanúsítvány\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Hiba a tanúsítvány feldolgozása közben: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "A tanúsítványt még nem aktiválták.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "A tanúsítvány lejárt.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "A tanúsítvány tulajdonosa nem felel meg a gépnévnek (%s).\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "A nyilvános kulcs nem felel meg a rögzített nyilvános kulcsnak!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "A tanúsítványnak X.509-nek kell lennie\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Hiba a címlista kezelésekor.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ismeretlen kiszolgáló" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "%s feloldása… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "meghiúsult: nem található IPv4/IPv6 cím a géphez.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "meghiúsult: idÅ‘túllépés.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: nem oldható fel a hiányos %s hivatkozás.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Érvénytelen URL: %s: %s.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "A HTTP kérés írása meghiúsult: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Nincsenek fejlécek, HTTP/0.9 feltételezése" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -986,11 +961,11 @@ msgstr "" "A fájl (%s) már létezik, nem kerül letöltésre.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "A gmtime hívás meghiúsult. Ez valószínűleg programhiba.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -998,55 +973,55 @@ msgstr "" "Az idÅ‘bélyeg nem alakítható http formátumúra. Visszaváltás 0-ra utolsó " "módosítási idÅ‘ként.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "A BODY adatfájl (%s) hiányzik: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Kapcsolat újrafelhasználása a következÅ‘höz: [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Újrahasználom a kapcsolatot a következÅ‘höz: %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "A proxy válasz olvasása meghiúsult: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HIBA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Rosszul formázott állapotsor" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "A proxy alagutazás meghiúsult: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ismeretlen hitelesítési séma.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Hitelesítés kijelölve: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Mentés ide: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1055,20 +1030,20 @@ msgstr "" "Az aláírás letöltése közben:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Nem olvasható az aláírás tartalma az ideiglenes fájlból. Kihagyás.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Nem olvasható az ideiglenes fájl. Az aláírás letöltésének kihagyása.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "A pri érték érvénytelen. %d feltételezése.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1076,42 +1051,42 @@ msgstr "" "Nem található elfogadható összesítés a Metalink erÅ‘forrásokhoz.\n" "Figyelmen kívül maradnak.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "A tapasztalt hibák miatt az SSL letiltásra kerül.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s kérés elküldve, várakozás válaszra… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Nem érkezett adat.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Olvasási hiba (%s) a fejlécekben.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(nincs leírás)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Hely: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nincs megadva" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [következik]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1120,7 +1095,7 @@ msgstr "" "A fájl (%s) nem módosult a kiszolgálón. A letöltés elmarad.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1132,7 +1107,7 @@ msgstr "" "Érdemes lehet megadni a --no-if-modified-since kapcsolót.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1142,58 +1117,58 @@ msgstr "" " A fájl már teljesen le van töltve; nincs teendÅ‘.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Hossz: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "figyelmen kívül hagyva" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Figyelmeztetés: a helyettesítÅ‘ karaktereket a HTTP nem támogatja.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "A „spider†mód bekapcsolva. A távoli fájl létezésének ellenÅ‘rzése.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s nem írható (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "A kapott fejlécbÅ‘l hiányzik egy kötelezÅ‘ attribútum.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "A felhasználónév/jelszó hitelesítés meghiúsult.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Nem írható a WARC fájl.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Az ideiglenes WARC fájl nem írható.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Nem lehet létrehozni SSL-kapcsolatot.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s nem törölhetÅ‘ (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HIBA: Ãtirányítás (%d) hely nélkül.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1201,25 +1176,25 @@ msgstr "" "Nem találhatók Metalink adatok a HTTP válaszban. A fájl letöltése HTTP GET-" "tel.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink fejlécek megtalálva. Váltás Metalink módba.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "A távoli fájl nem létezik -- hibás hivatkozás!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Az Utolsó módosítás fejléc hiányzik -- az idÅ‘bélyegek kikapcsolva.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Az Utolsó módosítás fejléc érvénytelen -- az idÅ‘bélyeg figyelmen kívül " "hagyva.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1228,16 +1203,16 @@ msgstr "" "A kiszolgálón lévÅ‘ %s fájl nem újabb mint a helyi -- nem kerül letöltésre.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "A méretek nem egyeznek (a helyi: %s) -- letöltésre kerül.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "A távoli fájl újabb, letöltésre kerül.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1247,7 +1222,7 @@ msgstr "" "letöltésre kerül.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1255,7 +1230,7 @@ msgstr "" "A távoli fájl létezik, de nem tartalmaz hivatkozásokat -- nem kerül " "letöltésre.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1265,7 +1240,7 @@ msgstr "" "de a rekurzió le van tiltva -- nem kerül letöltésre.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1273,12 +1248,12 @@ msgstr "" "A távoli fájl létezik.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1287,7 +1262,7 @@ msgstr "" "%s (%s) -- %s kiírva a szabványos kimenetre [%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1296,58 +1271,58 @@ msgstr "" "%s (%s) -- %s mentve [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) -- A kapcsolat lezárva a(z) %s. bájtnál. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) -- Olvasási hiba a(z) %s. bájtnál (%s). " -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) -- Olvasási hiba a(z) %s/%s. bájtnál (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nem támogatott védelmi minÅ‘ség: „%sâ€.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nem támogatott algoritmus: „%sâ€.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: A WGETRC a nem létezÅ‘ %s elemre mutat.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s nem olvasható (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Hiba a következÅ‘ben: %s, a(z) %d. sornál.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Szintaktikai hiba a következÅ‘ben: %s, a(z) %d. sornál.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ismeretlen parancs (%s) a következÅ‘ben: %s, a(z) %d. sornál.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1358,7 +1333,7 @@ msgstr "" "EllenÅ‘rizze a következÅ‘t: „%sâ€,\n" "vagy adjon meg másik fájlt a --config kapcsolóval.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1369,80 +1344,80 @@ msgstr "" "EllenÅ‘rizze a következÅ‘t: „%sâ€,\n" "vagy adjon meg másik fájlt a --config kapcsolóval.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Figyelmeztetés: Mind a rendszer, mind a felhasználói wgetrc a(z) %s " "elemre mutat.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Érvénytelen --execute parancs: %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: Érvénytelen logikai érték: %s, használja az „on†vagy „off†" "szavakat.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: Érvénytelen %s, használja az „onâ€, „off†vagy „quiet†egyikét.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Érvénytelen szám: %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: a(z) %s csak egyszer használható\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Érvénytelen bájtérték: %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Érvénytelen idÅ‘intervallum: %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Érvénytelen érték: %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Érvénytelen fejléc: %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Érvénytelen WARC fejléc: %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Érvénytelen folyamattípus: %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1452,40 +1427,40 @@ msgstr "" " használja a [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii] " "egyikét.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "A kódolás (%s) nem érvényes\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Az átalakítás (%s → %s) nem támogatott\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Nem teljes vagy érvénytelen több bájtos sorozat található\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Kezeletlen hibaszám: %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: a területi beállítás nincs megadva\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "az idn_encode meghiúsult (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "nem lehet csatlakozni %s %d. portjához: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1494,17 +1469,17 @@ msgstr "" "\n" "%s érkezett, a kimenet átirányítása %s fájlba.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; naplózás kikapcsolva.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [URL]…\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1514,74 +1489,74 @@ msgstr "" "rövid kapcsolónál is kötelezÅ‘.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Indítás:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version a Wget verziójának kiírása és kilépés\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help ezen súgó megjelenítése\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background indítás után folytatás a háttérben\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=PARANCS egy „.wgetrc†stílusú parancs végrehajtása\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Naplózás és bemeneti fájl:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FÃJL üzenetek naplózása a FÃJLBA\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FÃJL üzenetek hozzáfűzése a FÃJLHOZ\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug rengeteg hibakeresési információ kiírása\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug Watt-32 hibakeresési információk kiírása\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet csendes (nincs kimenet)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose részletes (ez az alapértelmezés)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose részletesség kikapcsolása csendes mód nélkül\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" " --report-speed=TÃPUS sávszélesség kiírása TÃPUSKÉNT. Ez bits lehet\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1589,7 +1564,7 @@ msgstr "" " -i, --input-file=FÃJL a helyi vagy külsÅ‘ FÃJLBAN található URL-címek\n" " letöltése\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1597,11 +1572,11 @@ msgstr "" " --input-metalink=FÃJL a helyi Metalink FÃJLBAN lefedett fájlok\n" " letöltése\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html a bemeneti fájl HTML-ként kezelése\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1609,26 +1584,26 @@ msgstr "" " -B, --base=URL a HTML bemeneti fájl hivatkozások (-i -F)\n" " feloldása az URL-hez képest\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=FÃJL használandó beállítófájl megadása\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-cookies ne használjon sütiket\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FÃJL az URL-visszautasítás okainak naplózása\n" " a FÃJLBA\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Letöltés:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1637,18 +1612,18 @@ msgstr "" "SZÃMRA\n" " (0=végtelen)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused újrapróbálkozás, még ha a kapcsolat\n" " visszautasításra kerül is\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FÃJL dokumentumok írása a FÃJLBA\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1657,14 +1632,14 @@ msgstr "" " fájlokra töltenének le (azokat " "felülírva)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies ne használjon sütiket\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1672,7 +1647,7 @@ msgstr "" " -c, --continue részben letöltött fájl letöltésének " "folytatása\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1680,13 +1655,13 @@ msgstr "" " --start-pos=ELTOLÃS letöltés kezdése a nullától kezdÅ‘dÅ‘ " "ELTOLÃSTÓL\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TÃPUS az elÅ‘rehaladás mérése típusának " "kiválasztása\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1694,7 +1669,7 @@ msgstr "" " --progress=TÃPUS az elÅ‘rehaladás mérése típusának " "kiválasztása\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1703,7 +1678,7 @@ msgstr "" " -N, --timestamping ne töltse le újra a fájlokat, hacsak nem\n" " újabbak a helyinél\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1713,7 +1688,7 @@ msgstr "" "get\n" " kéréseket idÅ‘bélyegzés módban\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1721,22 +1696,22 @@ msgstr "" " --no-use-server-timestamps ne állítsa be a helyi fájl idÅ‘bélyegét\n" " a kiszolgálón lévőére\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response a kiszolgáló válaszának kiírása\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ne töltsön le semmit\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=MÃSODPERC minden idÅ‘korlát értékének beállítása " "ennyi\n" " MÃSODPERCRE\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1744,7 +1719,7 @@ msgstr "" " --dns-servers=CÃMEK lekérdezendÅ‘ DNS kiszolgálók (vesszÅ‘kkel\n" " elválasztott) listája\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1753,31 +1728,31 @@ msgstr "" "vagy\n" " IP) a helyi gépen\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=MP a DNS kikeresés idÅ‘korlátjának beállítása\n" " MP másodpercre\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=MP a kapcsolódás idÅ‘korlátjának beállítása\n" " MP másodpercre\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=MP az olvasási idÅ‘korlát beállítása MP\n" " másodpercre\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=MÃSODPERC MÃSODPERC várakozás az újrapróbálkozások " "között\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1785,7 +1760,7 @@ msgstr "" " --waitretry=MÃSODPERC 1..MÃSODPERC várakozás egy újrapróbálkozás\n" " újrapróbálásai között\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1794,16 +1769,16 @@ msgstr "" "az\n" " újrapróbálkozások között\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy proxy kikapcsolása\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=SZÃM a letöltési kvóta beállítása a SZÃMRA\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1812,19 +1787,19 @@ msgstr "" "helyi\n" " gépen\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=SEBESSÉG a letöltési sebesség korlátozása a " "SEBESSÉGRE\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache DNS kikeresések gyorsítótárazásnak " "kikapcsolása\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1833,7 +1808,7 @@ msgstr "" " operációs rendszer által " "engedélyezettekre\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1841,15 +1816,15 @@ msgstr "" " --ignore-case kis- és nagybetűk figyelmen kívül\n" " hagyása fájlok/könyvtárak illesztésekor\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only kapcsolódás csak IPv4 címekhez\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only kapcsolódás csak IPv6 címekhez\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1860,25 +1835,25 @@ msgstr "" " ez az „IPv6â€, „IPv4†vagy „none†egyike " "lehet\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=FELHASZNÃLÓ mind az ftp, mind a http felhasználó " "beállítása\n" " a FELHASZNÃLÓRA\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=JELSZÓ mind az ftp, mind a http jelszó beállítása " "a JELSZÓRA\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password jelszavak bekérése\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1889,43 +1864,41 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI támogatás kikapcsolása\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KÓD a KÓD használata az IRI-k helyi " "kódolásaként\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KÓD a KÓD használata az IRI-k távoli " "kódolásaként\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink fájl törlése felülírás elÅ‘tt\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=SZÃM a letöltési kvóta beállítása a SZÃMRA\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1933,7 +1906,7 @@ msgstr "" " --metalink-over-http Metalink metaadatok használata HTTP\n" " válaszfejlécekbÅ‘l\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1942,7 +1915,7 @@ msgstr "" "részesített\n" " helye\n" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " @@ -1951,35 +1924,35 @@ msgstr "" " --no-glob helyettesítÅ‘ karakterek használatának\n" " kikapcsolása FTP fájlnevekben\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Könyvtárak:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ne hozzon létre könyvtárakat\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories könyvtárak létrehozásának kényszerítése\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories ne hozzon létre kiszolgálókönyvtárakat\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories a protokollnév használata a könyvtárakban\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=ELÅTAG fájlok mentése az ELÅTAG/… könyvtárba\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1987,25 +1960,25 @@ msgstr "" " --cut-dirs=SZÃM SZÃM darab távoli könyvtárösszetevÅ‘ " "kihagyása\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP kapcsolók:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=FELHASZNÃLÓ a http felhasználó beállítása\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=JELSZÓ a http jelszó beállítása\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache a kiszolgáló által gyorsítótárazott adatok\n" " tiltása\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2013,7 +1986,7 @@ msgstr "" " --default-page=NÉV az alapértelmezett oldalnév módosítása (ez\n" " általában az „index.htmlâ€)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2021,7 +1994,7 @@ msgstr "" " -E, --adjust-extension HTML/CSS dokumentumok mentése a megfelelÅ‘\n" " kiterjesztéssel\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" @@ -2029,12 +2002,12 @@ msgstr "" "kívül\n" " hagyása\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=KARAKTERLÃNC a KARAKTERLÃNC beszúrása a fejlécek közé\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2043,24 +2016,24 @@ msgstr "" " --progress=TÃPUS az elÅ‘rehaladás mérése típusának " "kiválasztása\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect oldalanként engedélyezett átirányítások\n" " maximális száma\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=FELHASZNÃLÓ a FELHASZNÃLÓ beállítása proxyfelhasználó-\n" " névként\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=JELSZÓ a JELSZÓ beállítása proxy jelszóként\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2068,18 +2041,18 @@ msgstr "" " --referer=URL a „Referer: URL†fejléc beillesztése a HTTP\n" " kérésbe\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers a HTTP fejlécek mentése fájlba\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" " -U, --user-agent=ÃœGYNÖK azonosítás ÃœGYNÖKKÉNT a Wget/VERZIÓ helyett\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2087,23 +2060,23 @@ msgstr "" " --no-http-keep-alive a HTTP keep-alive (tartós kapcsolatok)\n" " kikapcsolása\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne használjon sütiket\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FÃJL sütik betöltése a FÃJLBÓL a munkamenet\n" " megkezdése elÅ‘tt\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FÃJL sütik mentése a FÃJLBA a munkamenet után\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2111,7 +2084,7 @@ msgstr "" " --keep-session-cookies munkamenet (nem állandó) sütik betöltése és\n" " mentése\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2119,7 +2092,7 @@ msgstr "" " --post-data=KARAKTERLÃNC a POST módszer használata, a KARAKTERLÃNC\n" " küldése adatként\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2128,13 +2101,13 @@ msgstr "" "tartalmának\n" " küldése\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetódus a „HTTPMetódus†használata a fejlécben\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2142,7 +2115,7 @@ msgstr "" " --body-data=KARAKTERLÃNC a KARAKTERLÃNC küldése adatként.\n" " a --method megadása kötelezÅ‘\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2150,7 +2123,7 @@ msgstr "" " --body-file=FÃJL a FÃJL tartalmának küldése.\n" " a --method megadása kötelezÅ‘\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2162,7 +2135,7 @@ msgstr "" " helyi fájlnevek kiválasztásakor " "(KÃSÉRLETI)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2170,7 +2143,7 @@ msgstr "" " --content-on-error a kapott tartalom kiírása kiszolgálóhibák " "esetén\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2181,11 +2154,11 @@ msgstr "" "küldése\n" " a kiszolgáló kérésének megvárása nélkül\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) kapcsolók:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2196,44 +2169,44 @@ msgstr "" "„autoâ€,\n" " „SSLv2â€, „SSLv3â€, „TLSv1†és „PFS†egyike\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only csak biztonságos HTTPS hivatkozások " "követése\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ne ellenÅ‘rizze a kiszolgáló tanúsítványát\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FÃJL ügyfél tanúsítványfájlja\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TÃPUS ügyfél tanúsítványának típusa, PEM vagy " "DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FÃJL személyeskulcs-fájl\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TÃPUS személyes kulcs típusa, PEM vagy DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=FÃJL a tanúsítványok csoportját tartalmazó fájl\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2241,12 +2214,12 @@ msgstr "" " --ca-directory=KÖNYVTÃR a tanúsítványok hash listáját tároló\n" " könyvtár\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --ca-certificate=FÃJL a tanúsítványok csoportját tartalmazó fájl\n" -#: src/main.c:840 +#: src/main.c:849 #, fuzzy msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" @@ -2262,7 +2235,7 @@ msgstr "" " hash „sha256//†elÅ‘taggal, és „;â€\n" " elválasztóval; a partner ellenÅ‘rzéséhez\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2271,7 +2244,7 @@ msgstr "" "PRNG\n" " inicializálásához\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2280,15 +2253,15 @@ msgstr "" "foglalatot\n" " megnevezÅ‘ fájl\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS kapcsolók:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS tiltása\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2297,11 +2270,11 @@ msgstr "" "az\n" " alapértelmezést)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP kapcsolók:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2310,34 +2283,34 @@ msgstr "" "bináris\n" " FTP fájlhoz\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=FELHASZNÃLÓ az ftp felhasználó beállítása\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=JELSZÓ az ftp jelszó beállítása a JELSZÓRA\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne távolítsa el a „.listing†fájlokat\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob helyettesítÅ‘ karakterek használatának\n" " kikapcsolása FTP fájlnevekben\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp a „passzív†átviteli mód kikapcsolása\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions távoli fájljogosultságok megÅ‘rzése\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2347,11 +2320,11 @@ msgstr "" " által hivatkozott fájlok (nem könyvtárak)\n" " letöltése\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS kapcsolók:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2359,7 +2332,7 @@ msgstr "" " --ftps-implicit implicit FTPS használata\n" " (az alapértelmezett port a 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2371,7 +2344,7 @@ msgstr "" "adatkapcsolat\n" " nyitásakor\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2379,7 +2352,7 @@ msgstr "" " --ftps-clear-data-connection csak a vezérlÅ‘kapcsolat titkosítása;\n" " minden adat egyszerű szöveg lesz\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2387,11 +2360,11 @@ msgstr "" " --ftps-fallback-to-ftp visszaváltás FTP-re, ha az FTPS\n" " nem támogatott a cél kiszolgálón\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC kapcsolók:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2399,25 +2372,25 @@ msgstr "" " --warc-file=FÃJLNÉV kérés/válasz adatok mentése .warc.gz " "fájlba\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=KARAKTERLÃNC KARAKTERLÃNC beszúrása a warcinfo " "rekordba\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=SZÃM a WARC fájlok maximális mérete a SZÃM " "legyen\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX indexfájlok kiírása\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2425,25 +2398,25 @@ msgstr "" " --warc-dedup=FÃJLNÉV ne tárolja az ezen CDX fájlban felsorolt\n" " rekordokat\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ne tömörítse a WARC fájlokat GZIP-pel\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" " --no-warc-digests ne számítson SHA1 ellenÅ‘rzőösszegeket\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log ne tárolja a naplófájlt WARC rekordban\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2453,15 +2426,15 @@ msgstr "" "fájlok\n" " helye\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekurzív letöltés:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive rekurzív letöltés megadása\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2469,13 +2442,13 @@ msgstr "" " -l, --level=SZÃM maximális rekurziós mélység (inf vagy 0 = " "végtelen)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after helyi fájlok törlése letöltés után\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2485,7 +2458,7 @@ msgstr "" "CSS\n" " fájlban, hogy helyi fájlokra mutassanak\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2493,7 +2466,7 @@ msgstr "" " --convert-file-only csak az URL-ek fájl részének átalakítása\n" " (általában basename néven is ismert)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2501,7 +2474,7 @@ msgstr "" " --backups=N az X fájl írása elÅ‘tt legfeljebb N mentési fájl\n" " forgatása\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2510,7 +2483,7 @@ msgstr "" "X_orig\n" " néven mentés\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2519,14 +2492,14 @@ msgstr "" "orig\n" " néven mentés\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" " -m, --mirror ugyanaz, mint -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2535,7 +2508,7 @@ msgstr "" "kép\n" " stb. letöltése\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2543,11 +2516,11 @@ msgstr "" " --strict-comments a HTML megjegyzések szigorú (SGML) kezelésének\n" " bekapcsolása\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekurzív elfogadás/visszautasítás:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2555,7 +2528,7 @@ msgstr "" " -A, --accept=LISTA az elfogadott kiterjesztések vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2564,48 +2537,48 @@ msgstr "" "vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX a regex illesztés által elfogadott URL-" "ek\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX a regex illesztés által elutasított URL-" "ek\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TÃPUS regex típusa (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TÃPUS regex típus (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTA az elfogadott tartományok vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTA a visszautasított tartományok vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp FTP hivatkozások követése HTML\n" " dokumentumokból\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2613,7 +2586,7 @@ msgstr "" " --follow-tags=LISTA a követett HTML címkék vesszÅ‘kkel\n" " elválasztott listája\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2621,22 +2594,22 @@ msgstr "" " --ignore-tags=LISTA a figyelmen kívül hagyott HTML címkék\n" " vesszÅ‘kkel elválasztott listája\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts rekurzív módban menjen idegen gépekre is\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative csak a relatív hivatkozások követése\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LISTA az engedélyezett könyvtárak listája\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2646,81 +2619,81 @@ msgstr "" "által\n" " megadott név használata\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA a kihagyott könyvtárak listája\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ne lépjen be a szülÅ‘könyvtárba\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Hibajelentéseket és javaslatokat a címre küldhet\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, egy nem-interaktív hálózati letöltÅ‘.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "%s felhasználó jelszava: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Jelszó: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "nem hozható létre adatcsatorna" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "%s felhasználó jelszava: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Területi beállítás: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Fordítás: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Összeállítás: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2729,29 +2702,29 @@ msgstr "" "GNU Wget %s, összeállítva %s rendszeren.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2765,7 +2738,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2773,37 +2746,37 @@ msgstr "" "\n" "Eredetileg Hrvoje Niksic írta.\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Hibajelentések és kérdések a címre küldhetÅ‘k.\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Memóriafoglalási probléma\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Kilépés hiba miatt itt: %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "További kapcsolókért adja ki a „%s --help†parancsot.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: szabálytalan kapcsoló -- „-n%câ€\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "A hibakeresés támogatása nincs befordítva. A --debug figyelmen kívül marad.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2812,7 +2785,7 @@ msgstr "" "A --no-clobber és a --convert-links is meg lett adva, csak a --convert-links " "kerül felhasználásra.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2821,22 +2794,22 @@ msgstr "" "A --no-clobber és a --convert-file-only is meg lett adva, csak a --convert-" "file-only kerül felhasználásra.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Nem lehet részletes és csendes egyszerre.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Nem lehet idÅ‘bejegyzést is tenni egy fájlra és békén is hagyni.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Nem adható meg egyszerre mind a --inet4-only, mind az --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2848,7 +2821,7 @@ msgstr "" "kézikönyvet.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2858,7 +2831,7 @@ msgstr "" "minden letöltött tartalom a megadott fájlba kerül.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2868,12 +2841,7 @@ msgstr "" "A részletekért lásd a kézikönyvoldalt.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "A fájl („%sâ€) már létezik, nem kerül letöltésre.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2881,19 +2849,19 @@ msgstr "" "A WARC kimenet nem működik a --no-clobber kapcsolóval, így ez ki lesz " "kapcsolva\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "A WARC kimenet nem működik az idÅ‘bélyegekkel, így ez ki lesz kapcsolva.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "A WARC kimenet nem működik a --spider kapcsolóval.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2902,7 +2870,7 @@ msgstr "" "A WARC kimenet nem működik a --continue vagy --start-pos kapcsolóval, ezek\n" "le lesznek tiltva.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2910,7 +2878,7 @@ msgstr "" "Az ellenÅ‘rzőösszegek letiltva, a WARC deduplikáció nem fogja megtalálni a " "többszörös rekordokat.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2919,12 +2887,12 @@ msgstr "" "A WARC kimenet nem működik a --continue vagy --start-pos kapcsolóval, ezek\n" "le lesznek tiltva.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Nem adható meg egyszerre az --ask-password és a --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2933,17 +2901,17 @@ msgstr "" "A --start-pos és a --continue együttes megadása nem javasolt, a --continue " "le lesz tiltva.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: hiányzó URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Nem adható meg egyszerre a --post-data és a --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2952,7 +2920,7 @@ msgstr "" "Nem használható a --post-data vagy --post-file és a --method együtt. A --" "method az adatokat a --body-data és --body-file kapcsolókon keresztül várja" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2961,17 +2929,17 @@ msgstr "" "Meg kell adnia egy metódust a --method=HTTPMetódus használatával a --body-" "data vagy --body-file kapcsolókhoz.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Nem adható meg egyszerre a --body-data és a --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ez a verzió nem tartalmazza az IRI-k támogatását\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2979,7 +2947,7 @@ msgstr "" "A -k vagy -r csak akkor használható a -O-val együtt, ha normál fájl a " "kimenet.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2988,42 +2956,42 @@ msgstr "" "A --convert-links vagy --convert-file-only csak akkor használható együtt, ha " "normál fájl a kimenet.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Nem sikerült a libcares elÅ‘készítése\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nem sikerült a c-ares csatorna elÅ‘készítése\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Nem sikerült az IP-cím („%sâ€) feldolgozása\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Nem sikerült a DNS kiszolgálók („%sâ€) beállítása (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nem található URL a következÅ‘ben: %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "%s metalink fájl feldolgozása sikertelen.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Nem tölthetÅ‘ le minden erÅ‘forrás innen: %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3034,7 +3002,7 @@ msgstr "" "Valóságban eltelt teljes idÅ‘: %s\n" "Letöltve: %d fájl, %s %s alatt (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "A letöltési korlát (%s) TÚLLÉPVE!\n" @@ -3195,105 +3163,105 @@ msgstr "%s fájl letöltve, de az aláírás nem megfelelÅ‘.\n" msgid "Renaming %s to %s.\n" msgstr "%s eltávolítása.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Folytatás a háttérben.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Folytatás a háttérben, a pid: %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "A kimenet a következÅ‘ fájlba lesz kiírva: %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "a fake_fork_child() meghiúsult\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "a fake_fork() meghiúsult\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nem található használható foglalat-illesztÅ‘program.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "az ioctl() meghiúsult. A foglalat nem állítható be blokkolóként.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: figyelmeztetés: %s jelsor található a gépnév elÅ‘tt\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ismeretlen token „%sâ€\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Használat: %s NETRC [GÉPNÉV]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s nem érhetÅ‘ el: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "FIGYELMEZTETÉS: gyenge véletlenmag kerül felhasználásra.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "A PRNG nem inicializálható; fontolja meg a --random-file használatát.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Az OpenSSL verzió túl régi a TLSv1.1 támogatásához\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Az OpenSSL verzió túl régi a TLSv1.2 támogatásához\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: megvalósítatlan „secure-protocol†beállításérték: %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: %s %s által kiadott tanúsítványa nem ellenÅ‘rizhetÅ‘:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " A kibocsátó hitelessége nem ellenÅ‘rizhetÅ‘ helyileg.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Saját aláírású tanúsítvány.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " A kibocsátott tanúsítvány még nem érvényes.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " A kibocsátott tanúsítvány lejárt.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3302,14 +3270,14 @@ msgstr "" "%s: a tanúsítvány alanyának alternatív neve nem egyezik\n" "\ta kért %s gépnévvel.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: a tanúsítvány %s általános neve nem egyezik a kért %s gépnévvel.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3321,14 +3289,14 @@ msgstr "" " Ez azt jelezheti, hogy a gép nem az, akinek mondja magát\n" " (azaz nem a valódi %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "A nem biztonságos kapcsolódáshoz %s géphez használja a --no-check-" "certificate kapcsolót.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3337,28 +3305,28 @@ msgstr "" "\n" "%*s[ kihagyva %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Érvénytelen pontstílus meghatározás: %s; változatlanul hagyva.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " kész: %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " idÅ‘ " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "A valós idejű óra frekvenciája nem kérhetÅ‘ le: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "%s eltávolítása, mivel vissza kellene utasítani.\n" @@ -3372,22 +3340,22 @@ msgstr "%s nem nyitható meg: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt betöltése; hagyja figyelmen kívül a hibákat.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Hiba a proxy URL feldolgozása közben: %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Hiba a(z) %s proxy URL-ben: HTTP kell legyen.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d átirányítás túllépve.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3395,7 +3363,7 @@ msgstr "" "Feladás.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3403,126 +3371,126 @@ msgstr "" "Újrapróbálkozás.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Nincs hiba" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nem támogatott séma (%s) " -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "A séma hiányzik" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Érvénytelen gépnév" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Rossz portszám" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Érvénytelen felhasználói név" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Befejezetlen IPv6 numerikus cím" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Az IPv6 címek nem támogatottak" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Hibás IPv6 numerikus cím" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "A HTTPS támogatás nincs befordítva" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Nem teljes vagy érvénytelen több bájtos sorozat található\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: A szükséges memória lefoglalása meghiúsult; elfogyott a memória.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: %ld bájt lefoglalása meghiúsult; elfogyott a memória.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: a szöveges puffer túl nagy (%d bájt), megszakítás.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Folytatás a háttérben, a pid: %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "A szimbolikus link (%s) törlése meghiúsult: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Nem sikerült a libcares elÅ‘készítése\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nem kérhetÅ‘ le süti ehhez: %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nem kérhetÅ‘ le süti ehhez: %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Nem sikerült az IP-cím („%sâ€) feldolgozása\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nem kérhetÅ‘ le süti ehhez: %s\n" +msgstr "Nem sikerült a DNS kiszolgálók („%sâ€) beállítása (%d)\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Érvénytelen reguláris kifejezés: %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Hiba %s illesztése közben: %d.\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3608,6 +3576,37 @@ msgstr "Az ideiglenes WARC fájl nem nyitható meg.\n" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "Pontos találat a CDX fájlban. A revizit rekord mentése a WARC-ba.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a(z) „--%s†kapcsoló nem enged meg argumentumot\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: a(z) „--%s†kapcsoló ismeretlen\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a „-W %s†kapcsoló nem enged meg argumentumot\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a „-W %s†kapcsolóhoz argumentum szükséges\n" + +#~ msgid "Invalid UTF-8 sequence: %s\n" +#~ msgstr "Érvénytelen UTF-8 sorozat: %s\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "az idn_decode meghiúsult (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s érkezett.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "A fájl („%sâ€) már létezik, nem kerül letöltésre.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3628,18 +3627,5 @@ msgstr "Pontos találat a CDX fájlban. A revizit rekord mentése a WARC-ba.\n" #~ "%d hibás hivatkozás.\n" #~ "\n" -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "Érvénytelen UTF-8 sorozat: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "az idn_decode meghiúsult (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s érkezett.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "A hitelesítés meghiúsult.\n" diff --git a/po/id.gmo b/po/id.gmo index 4ee5e07..1d92a71 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index 982cd80..c4cd220 100644 --- a/po/id.po +++ b/po/id.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.16.1.46\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2015-06-01 10:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -22,7 +22,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Error sistem tidak diketahui" @@ -30,7 +30,7 @@ msgstr "Error sistem tidak diketahui" msgid "Address family for hostname not supported" msgstr "Pengalamatan IPv6 tidak disupport" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Resolusi nama untuk sementara gagal" @@ -98,70 +98,45 @@ msgstr "Interrupted by a signal" msgid "Parameter string not correctly encoded" msgstr "Parameter string not correctly encoded" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Kesalahan tidak diketahui" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: pilihan '%s' adalah pilihan yang ambigu:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pilihan '-W %s' adalah sebuah ambigu\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: pilihan '--%s' tidak memperbolehkan sebuah argumen\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: pilihan '%s' adalah pilihan yang ambigu:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: pilihan '%c%s' tidak diketahui\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pilihan '%c%s' tidak memperbolehkan sebuah argumen\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: pilihan '--%s' tidak diketahui\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: pilihan '%c%s' tidak diketahui\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan -- '%c' tidak valid\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: pilihan '-W %s' adalah sebuah ambigu\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: pilihan '-W %s' tidak memperbolehkan sebuah argumen\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -181,13 +156,13 @@ msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -260,28 +235,28 @@ msgstr "Ekspresi regular terlalu besar" msgid "Unmatched ) or \\)" msgstr "Tidak cocok ) atau \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Tidak ada ekspresi regular sebelumnya" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "cannot create pipe" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s subprocess failed" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle failed" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "cannot restore fd %d: dup2 failed" @@ -300,51 +275,51 @@ msgstr "%s subprocess got fatal signal %d" msgid "memory exhausted" msgstr "kehabisan memori" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: tidak dapat menemukan alamat bind %s; menonaktifkan bind.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Menghubungi %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Menghubungi %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Menghubungi [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "terhubung.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "gagal: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: tidak dapat menemukan alamat dari %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -378,174 +353,174 @@ msgstr "Tidak dapat menghapus %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Tidak dapat membackup %s sebagai %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Tidak dapat memperoleh cookie untuk %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntax error dalam Set-Cookie: %s pada posisi %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie datang dari %s mencoba untuk menset domain menjadi " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Tidak dapat membuka berkas cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Error menulis ke %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Error menutup %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Tipe listing tidak disupport, mencoba listing Unix parser.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index dari/%s pada %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "waktu tidak diketahui " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "File " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Direktori " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "LInk " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Tidak yakin " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Besar: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) tersisa" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s tersisa" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (unauthoritative)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Masuk sebagai %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Error dalam balasan server, menutup kontrol koneksi.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Error dalam salam server.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Gagal menulis, menutup kontrol koneksi.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Server menolak untuk login.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Login tidak benar.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Logged in!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Server error, tidak dapat menentukan tipe sistem.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "selesai. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "selesai.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipe `%c' tidak diketahui, menutup kontrol koneksi.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "selesai. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD tidak dibutuhkan.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Secara logika bagian tidak mungkin dicapai dalam getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -553,7 +528,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -562,37 +537,37 @@ msgstr "" "Tidak ada direktori %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD tidak diperlukan.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Berkas sudah diambil.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Tidak dapat menginitialisasi transfer PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Tidak dapat parse PASV balasan.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "tidak dapat menghubungi %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind error (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT tidak valid.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -600,17 +575,17 @@ msgstr "" "\n" "REST gagal, memulai dari awal.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Berkas %s ada.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Tidak ada berkas seperti itu %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -619,7 +594,7 @@ msgstr "" "Tidak ada berkas %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -628,40 +603,40 @@ msgstr "" "Tidak ada berkas atau direktori %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s memiliki sprung kedalam eksistensi.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, menutup kontrol koneksi.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Data koneksi: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Koneksi kontrol ditutup.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Data transfer dibatalkan.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Berkas %s sudah ada disana; tidak diambil.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(coba:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -670,7 +645,7 @@ msgstr "" "%s (%s) - ditulis ke stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -679,35 +654,35 @@ msgstr "" "%s (%s) - %s disimpan [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Menghapus %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Menggunakan %s sebagai berkas listing sementara.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Menghapus %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Kedalaman recursion %d melebihi maksimum kedalaman %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Berkas remote tidak ada yang lebih baru dari berkas lokal %s -- tidak " "diambil.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -716,7 +691,7 @@ msgstr "" "Berkas remote lebih baru dari berkas lokal %s -- diambil.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -725,11 +700,11 @@ msgstr "" "Besar tidak cocok dengan (local %s) -- diambil.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nama symlink tidak valid, dilewati.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -738,240 +713,240 @@ msgstr "" "Sudah memiliki symlink %s -> %s yang benar\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Membuat symlink %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Symlink tidak didukung, melewatkan symlink %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Melewati direktori %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tidak diketahui/tidak disupport tipe file.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Tidak dapat memperoleh cookie untuk %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: time-stamp corrupt/rusak.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Tidak akan mengambil dir karena kedalamannya %d (maksimal %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Tidak turun ke %s karena ini di excluded/tidak termasuk.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Menolak %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Gagal mencocokan %s dengan %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Tidak ada pola %s yang cocok.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Menulis HTML-ized indeks ke %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Menulis HTML-ized indeks ke %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERROR: Tidak ada direktori %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Error dalam membaca sertifikat: %s.\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, fuzzy, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Dimuat berkas CRL '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: tidak diimplementasikan 'secure-protocol' nilai pilihan %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" "Mohon kirimkan laporan kesalahan dan pertanyaan ke .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: tidak diimplementasikan 'secure-protocol' nilai pilihan %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERROR" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "PERINGATAN" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Tidak ada certificate yang di berikan oleh %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Sertifikat dari %s tidak dipercaya.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Sertifikat dari %s belum memperoleh penerbit yang dikenal.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikat dari %s telah dicabut.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Sertifikat dari %s tidak dipercaya CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Sertifikat dari %s belum memperoleh penerbit yang dikenal.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Sertifikat dari %s tidak dipercaya.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Sertifikat dari %s telah dicabut.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Error menginisialisasi sertifikat X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Tidak ada sertifikat yang ditemukan\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Error dalam membaca sertifikat: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Sertifikat belum diaktifkan.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Sertifikat telah habis masa berlakunya.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Pemilik sertifikat tidak cocok dengan nama host %s.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certificate must bu X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Kesalahan dalam penanganan daftar alamat.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Host tidak diketahui" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Resolving %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "gagal: Tidak ada alamat IPv4/IPv6 untuk host.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "gagal: waktu habis.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Tidak dapat menresolve link yang tidak komplit %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL tidak valid %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Gagal menulis permintaan HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Tidak ada headers, mengasumsikan HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -980,133 +955,133 @@ msgstr "" "Berkas %s sudah ada; tidak diambil.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY data berkas %s hilang: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Menggunakan koneksi yang sudah ada ke [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Menggunakan koneksi yang sudah ada ke %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Gagal membaca balasan proxy: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERROR %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Status line salah format" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxy tunneling gagal: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Skema authentifikasi tidak diketahui.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Skema authentifikasi tidak diketahui.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Simpan ke: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Menonaktifkan SSL karena adanya errors.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Permintaan %s dikirimkan, menunggu balasan... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Tidak ada data yang diterima.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Read error (%s) dalam headers.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(tidak ada deskripsi)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Lokasi: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "tidak dispesifikasikan" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [mengikuti]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1114,7 +1089,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1124,82 +1099,82 @@ msgstr "" " File sudah secara penuh diterima; tidak ada yang harus dilakukan lagi.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Besar: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "diabaikan" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Peringatan: wildcards tidak disupport dalam HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Mode laba-laba diaktifkan. Check jika berkas tujuan ada.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Tidak dapat menulis ke %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Required attribute missing from Header received.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Username/Password Authentication Failed.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Tidak dapat menulis ke WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Tidak dapat membuat koneksi SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Tidak dapat menulis ke %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERROR: Redireksi (%d) tanpa lokasi.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Berkas tidak ada -- link rusak!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Header yang paling akhir dimodifikasi hilang -- time-stamps dimatikan.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "header yang paling akhir dimodifikasi tidak valid -- time-stamp diabaikan.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1209,16 +1184,16 @@ msgstr "" "diambil.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Besar tidak cocok (local %s) -- diambil.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "File remote lebih baru, diambil.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1228,7 +1203,7 @@ msgstr "" "mengambil.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1236,7 +1211,7 @@ msgstr "" "Berkas tujuan ada tapi tidak berisi sumber lain -- tidak diambil.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1246,7 +1221,7 @@ msgstr "" "recursion dinonaktifkan -- tidak mencoba.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1254,12 +1229,12 @@ msgstr "" "Berkas tujuan ada.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1268,7 +1243,7 @@ msgstr "" "%s (%s) - disimpan ke stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1277,58 +1252,58 @@ msgstr "" "%s (%s) - %s disimpan [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Hubungan ditutup pada byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Read error pada byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Read error pada byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Unsupported quality of protection '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Skema tidak didukung '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC menunjuk ke %s, dimana itu tidak ada.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Tidak dapat membaca %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Error dalam %s pada baris %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntax error dalam %s pada baris %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Perintah tidak diketahui %s dalam %s pada baris %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1339,7 +1314,7 @@ msgstr "" "'%s',\n" "or specify a different file using --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1350,75 +1325,75 @@ msgstr "" "'%s',\n" "or specify a different file using --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Peringatan: Kedua sistem dan pengguna wgetrc menunjuk ke %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Tidak valid --execute perintah %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Boolean tidak valid %s; gunakan `on' atau `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Boolean tidak valid %s; gunakan `on' atau `off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Nomor tidak valid %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Nilai byte tidak valid %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Perioda waktu tidak valid %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Nilai tidak valid %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Header tidak valid %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Header WARC tidak valid %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tipe progress tidak valid %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1427,40 +1402,40 @@ msgstr "" "%s: %s: Pembatasan tidak benar %s, \n" " gunakan [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Pengkodean %s tidak valid\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, fuzzy, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konversi dari %s ke %s belum didukung\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Tidak lengkap atau tidak valid urutan multibyte ditemui\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Errno tidak tertangani %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "local_to_utf8: lokal tidak diset\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode gagal (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "tidak dapat menghubungi %s port %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1469,17 +1444,17 @@ msgstr "" "\n" "%s diterima, meneruskan output ke %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; mematikan logging.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Penggunaan: %s [PILIHAN]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1488,68 +1463,68 @@ msgstr "" "pendek.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Memulai:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version menampilkan versi dari Wget dan keluar.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help menampilkan bantuan ini.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background pergi ke background setelah memulai.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMAND menjalankan sebuah perintah `.wgetrc'-style.\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Mencatat dan memasukan berkas:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE pesan log pada FILE.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE tambahkan pesan pada FILE.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug tampilkan banyak informasi debugging.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug tampilkan keluaran Watt-32 debug.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet diam (tidak ada output).\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose jadi verbose (ini yang default).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1557,7 +1532,7 @@ msgid "" msgstr "" " -nv, --no-verbose matikan verboseness, tanpa menjadi quiet.\n" -#: src/main.c:603 +#: src/main.c:612 #, fuzzy msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " @@ -1565,7 +1540,7 @@ msgid "" msgstr "" " --report-speed=TYPE Output bandwidth as TYPE. TYPE can be bits.\n" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1574,7 +1549,7 @@ msgstr "" " -i, --input-file=BERKAS download URLs ditemukan dalam lokal atau " "BERKAS eksternal.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1583,12 +1558,12 @@ msgstr "" " -i, --input-file=BERKAS download URLs ditemukan dalam lokal atau " "BERKAS eksternal.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html perlakukan input file sebagai HTML.\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1597,27 +1572,27 @@ msgstr "" " -B, --base=URL telusuri berkas masukan HTML (-i -F)\n" " relatif ke URL.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE Specify config file to use.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:620 +#: src/main.c:629 #, fuzzy msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " -o, --output-file=FILE pesan log pada FILE.\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1626,18 +1601,18 @@ msgstr "" " -t, --tries=NUMBER set nomor mencoba ke NUMBER (0 untuk tidak " "terbatas).\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused coba lagi walaupun koneksi ditolak.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE tulis document pada FILE.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1646,14 +1621,14 @@ msgstr "" " -nc, --no-clobber skip downloads yang akan mendownload ke\n" " file yang sudah ada.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1662,25 +1637,25 @@ msgstr "" " -c, --continue lanjutkan mengambil file yang terdownload " "sebagian.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE pilih tipe gauge progress.\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=TYPE pilih tipe gauge progress.\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1690,7 +1665,7 @@ msgstr "" " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:648 +#: src/main.c:657 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1700,7 +1675,7 @@ msgstr "" " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1709,29 +1684,29 @@ msgstr "" " -N, --timestamping jangan mengambil kembali file kecuali file\n" " lebih baru dari file local.\n" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response tampilkan balasan server.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider jangan mendownload apapun.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDS set semua nilai timeout pada SECONDS.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1740,29 +1715,29 @@ msgstr "" " --bind-address=ADDRESS bind ke ADDRESS (hostname atau IP) pada " "local host.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECS set the DNS lookup timeout pada SECS.\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SECS set the connect timeout pada SECS.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SECS set the read timeout pada SECS.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDS tunggu SECONDS diantara pengambilan.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1771,7 +1746,7 @@ msgstr "" " --waitretry=SECONDS tunggu 1..SECONDS diantara pencobaan dari " "sebuah pengambilan.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1780,17 +1755,17 @@ msgstr "" " --random-wait tunggu dari 0.5*WAIT...1.5*WAIT secs " "diantara pengambilan.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy secara eksplisit mematikan proxy.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=NUMBER set pengambilan quota pada NUMBER.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1799,17 +1774,17 @@ msgstr "" " --bind-address=ADDRESS bind ke ADDRESS (hostname atau IP) pada " "local host.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RATE batasi kecepatan download ke RATE.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache matikan caching dari DNS lookups.\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1818,7 +1793,7 @@ msgstr "" " --restrict-file-names=OS restrict karakter dalam nama file ke salah " "satu dari yang dibolehkan oleh OS.\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1827,19 +1802,19 @@ msgstr "" " --ignore-case abaikan besar/kecil huruf ketika mencocokan " "files/direktori..\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only hanya menghubungi ke alamat IPv4 saja.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only hanya menghubungi ke alamat IPv6 saja.\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1850,25 +1825,25 @@ msgstr "" "yang dispesifikasikan,\n" " salah satu dari IPv6, IPv4 atau none.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=USER set kedua ftp dan http user pada USER.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PASS set kedua ftp dan http password pada PASS.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password tanya untuk kata sandi.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1879,12 +1854,12 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri non-aktifkan dukungan IRI.\n" -#: src/main.c:714 +#: src/main.c:723 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1892,7 +1867,7 @@ msgstr "" " --local-encoding=ENC gunakan ENC sebagai pengkodean lokal untuk " "IRI.\n" -#: src/main.c:716 +#: src/main.c:725 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1900,74 +1875,73 @@ msgstr "" " --remote-encoding=ENC gunakan ENC sebagai pengkodean baku " "remote.\n" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --unlink remove file before clobber.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" -msgstr " -Q, --quota=NUMBER set pengambilan quota pada NUMBER.\n" +msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-glob matikan FTP nama file globbing.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Direktori:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories jangan membuat direktori.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories paksa pembuatan direktori.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories jangan buat host directories.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories gunakan nama protocol dalam direktori.\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX simpan file pada PREFIX/...\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1976,26 +1950,26 @@ msgstr "" " --cut-dirs=NUMBER abaikan NUMBER remote komponen " "direktori.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Pilihan HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER set http user pada USER.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS set http password pada PASS.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --nocache dissallow server-cached data.\n" -#: src/main.c:760 +#: src/main.c:769 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -2004,7 +1978,7 @@ msgstr "" " --default-page=NAMA Ubah nama halaman baku (biasanya\n" " ini `index.html'.).\n" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2013,26 +1987,26 @@ msgstr "" " -E, --adjust-extension simpan HTML/CSS dokumen dengan ekstensi yang " "sesuai.\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length abaikan `Content-Length' bagian header.\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRING masukkan STRING dalam headers.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYPE pilih tipe gauge progress.\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" @@ -2040,17 +2014,17 @@ msgstr "" " --max-redirect batas maksimal yang diperbolehkan untuk " "redirection setiap halaman.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=USER set USER sebagai username proxy.\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=PASS set PASS sebagai password proxy.\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2059,12 +2033,12 @@ msgstr "" " --referer=URL masukkan `Referer: URL' header dalam HTTP " "request.\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers simpan HTTP headers pada file.\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2073,7 +2047,7 @@ msgstr "" " -U, --user-agent=AGENT identifikasi sebagai AGEN daripada sebagai " "Wget/VERSION.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2082,25 +2056,25 @@ msgstr "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "koneksi).\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies jangan menggunakan cookies.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FILE load cookies dari FILE sebelum session.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FILE simpan cookies pada FILE sesudah session.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2109,7 +2083,7 @@ msgstr "" " --keep-session-cookies load dan simpan session (non-permanen) " "cookies.\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2118,7 +2092,7 @@ msgstr "" " --post-data=STRING gunakan metoda POST; kirim STRING sebagai " "data.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2126,14 +2100,14 @@ msgid "" msgstr "" " --post-file=FILE gunakan metoda POST; kirim isi dari FILE.\n" -#: src/main.c:799 +#: src/main.c:808 #, fuzzy msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod use method \"HTTPMethod\" in the header.\n" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2141,7 +2115,7 @@ msgid "" msgstr "" " --body-data=STRING Send STRING as data. --method MUST be set.\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2149,7 +2123,7 @@ msgid "" msgstr "" " --body-file=FILE Send contents of FILE. --method MUST be set.\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2161,7 +2135,7 @@ msgstr "" "memilih\n" " berkas lokal (EKSPERIMEN).\n" -#: src/main.c:808 +#: src/main.c:817 #, fuzzy msgid "" " --content-on-error output the received content on server " @@ -2170,7 +2144,7 @@ msgstr "" " --content-on-error output the received content on server " "errors.\n" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2182,11 +2156,11 @@ msgstr "" "tanpa\n" " harus menunggu untuk ditanyai oleh server.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Pilihan HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2197,46 +2171,46 @@ msgstr "" "auto,\n" " SSLv2, SSLv3, dan TLSv1.\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only ikuti link HTTPS only secure\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate jangan memvalidasi server certificate.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE client certificate file.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE tipe sertifikate client, PEM atau DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE private key file.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TYPE tipe private key, PEM atau DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FILE file yang berisi CA's.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2245,12 +2219,12 @@ msgstr "" " --ca-directory=DIR direktori dimana hash list dari CA's " "disimpan\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FILE file yang berisi CA's.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2260,7 +2234,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2269,7 +2243,7 @@ msgstr "" " --random-file=FILE file dengan data acak untuk seeding SSL " "PRNG.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2278,28 +2252,28 @@ msgstr "" " --egd-file=FILE penamaan file EGD socket dengan data " "random.\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Pilihan HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --nocache dissallow server-cached data.\n" -#: src/main.c:861 +#: src/main.c:870 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " -v, --verbose jadi verbose (ini yang default).\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Pilihan FTP:\n" -#: src/main.c:869 +#: src/main.c:878 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2308,38 +2282,38 @@ msgstr "" " --ftp-stmlf Gunakan format Stream_LF untuk seluruh berkas " "binari FTP.\n" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER set ftp user pada USER.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS set ftp password pada PASS.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing jangan hapus file `.listing'.\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob matikan FTP nama file globbing.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp disable the \"passive\" mode trasfer.\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions preserver remote file permissions.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2348,12 +2322,12 @@ msgstr "" " --retr-symlinks ketika berekursif, ambil linked-to files " "(bukan dir).\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Pilihan FTP:\n" -#: src/main.c:891 +#: src/main.c:900 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2362,7 +2336,7 @@ msgstr "" " --ftp-stmlf Gunakan format Stream_LF untuk seluruh berkas " "binari FTP.\n" -#: src/main.c:893 +#: src/main.c:902 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2373,23 +2347,23 @@ msgstr "" "file\n" " lebih baru dari file local.\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Pilihan WARC:\n" -#: src/main.c:904 +#: src/main.c:913 #, fuzzy msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " @@ -2398,26 +2372,26 @@ msgstr "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file.\n" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRING masukkan STRING dalam warcinfo record.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER.\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx write CDX index files.\n" -#: src/main.c:912 +#: src/main.c:921 #, fuzzy msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " @@ -2426,19 +2400,19 @@ msgstr "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file.\n" -#: src/main.c:915 +#: src/main.c:924 #, fuzzy msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression do not compress WARC files with GZIP.\n" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests do not calculate SHA1 digests.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2447,7 +2421,7 @@ msgstr "" " --no-warc-keep-log do not store the log file in a WARC " "record.\n" -#: src/main.c:922 +#: src/main.c:931 #, fuzzy msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " @@ -2458,17 +2432,17 @@ msgstr "" "the\n" " WARC writer.\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Recursive download:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive spesifikasikan untuk mendownload rekursif.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2477,7 +2451,7 @@ msgstr "" " -l, --level=NUMBER maksimum kedalaman rekursi (inf atau 0 untuk tak " "terhingga).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2485,7 +2459,7 @@ msgid "" msgstr "" " --delete-after delete files locally sesudah mendownloadnya.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2496,20 +2470,20 @@ msgstr "" "yang\n" " menunjuk ke berkas lokal.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 #, fuzzy msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr " --backups=N sebelum mengubah berkas X, backup sebagai X.orig.\n" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2518,7 +2492,7 @@ msgstr "" " -K, --backup-converted sebelum mengubah berkas X, backup sebagai X." "orig.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2526,7 +2500,7 @@ msgid "" msgstr "" " -K, --backup-converted sebelum mengubah file X, backup sebagai X.orig.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2535,7 +2509,7 @@ msgstr "" " -m, --mirror shortcut untuk -N -r -l inf --no-remove-" "listing.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2544,7 +2518,7 @@ msgstr "" " -p, --page-requisites ambil semua gambar, dll. yang diperlukan untuk " "menampilkan file HTML.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2553,11 +2527,11 @@ msgstr "" " --strict-comments hidupkan strick (SGML) handling dari komentar " "HTML.\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Recursive diterima/ditolak:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2566,7 +2540,7 @@ msgstr "" " -A, --accept=LIST list yang dipisahkan oleh koma yang " "berisiekstensi yang diterima.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2575,27 +2549,27 @@ msgstr "" " -R, --reject=LIST list yang dipisahkan oleh koma yang " "berisiekstensi yang ditolak.\n" -#: src/main.c:964 +#: src/main.c:973 #, fuzzy msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX regex matching accepted URLs.\n" -#: src/main.c:966 +#: src/main.c:975 #, fuzzy msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX regex matching rejected URLs.\n" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE pilih tipe regex (posix|pcre).\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE pilih tipe regex (posix).\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2603,7 +2577,7 @@ msgstr "" " -D, --domains=LIST list yang dipisahkan oleh koma yang " "berisidomains yang dibolehkan.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2611,13 +2585,13 @@ msgstr "" " --exclude-domains=LIST list yang dipisahkan oleh koma yang " "berisidomains yang direject/tolak.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp ikuti link FTP dari dokumen HTML.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2626,7 +2600,7 @@ msgstr "" " --follow-tags=LIST list yang dipisahkan oleh koma yang " "berisitag HTML yang diikuti\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2635,25 +2609,25 @@ msgstr "" " --ignore-tags=LIST list yang dipisahkan oleh koma yang " "berisitag HTML yang diabaikan.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts pergi ke host asing ketika recursive.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative hanya mengikuti links relative saja.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LIST list dari direktori yang dibolehkan.\n" -#: src/main.c:991 +#: src/main.c:1000 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2664,86 +2638,86 @@ msgstr "" "file\n" " lebih baru dari file local.\n" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LIST list dari direktori yang diabaikan.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent jangan merambah direktori atasnya.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Laporkan bug dan saran kepada .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, adalah sebuah non-interaktif network retriever.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Kata sandi untuk pengguna %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Kata sandi: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "cannot create pipe" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Kata sandi untuk pengguna %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokal: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilasi: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Sambungkan: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2752,29 +2726,29 @@ msgstr "" "GNU Wget %s dibuat di %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (lingkungan)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (pengguna)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistem)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Hak Cipta (C) 2011 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2789,7 +2763,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2797,37 +2771,37 @@ msgstr "" "\n" "Originalnya ditulis oleh Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Mohon kirimkan laporan kesalahan dan pertanyaan ke .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Memory allocation problem\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Exiting due to error in %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: illegal pilihan -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2836,7 +2810,7 @@ msgstr "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2845,23 +2819,23 @@ msgstr "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Tidak dapat verbose dan quiet pada waktu bersamaan.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Tidak dapat timestamp dan tidak menclobber file lama pada waktu bersamaan.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Tidak dapat menspesifikasikan berdua --inet4-only dan --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2874,7 +2848,7 @@ msgstr "" "dengan -p atau -r. Lihat manual untuk informasi lebih details.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2884,7 +2858,7 @@ msgstr "" "akan diambil akan diletakan dalam sebuah berkas yang anda spesifikasikan.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2894,31 +2868,26 @@ msgstr "" "untuk informasi lebih lengkap.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "File `%s' sudah ada disana; tidak diambil.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "WARC output does not work with timestamping, timestamping will be disabled.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC output does not work with --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, fuzzy, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2926,14 +2895,14 @@ msgid "" msgstr "" "WARC output does not work with --continue, --continue will be disabled.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2941,29 +2910,29 @@ msgid "" msgstr "" "WARC output does not work with --continue, --continue will be disabled.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Tidak dapat menspesifikasikan baik --ask-password dan --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: hilang URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Tidak dapat menspesifikasikan baik --post-data dan --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2972,7 +2941,7 @@ msgstr "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2981,24 +2950,24 @@ msgstr "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Tidak dapat menspesifikasikan berdua --body-data dan --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Versi ini tidak mendukung untuk IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k can be used together with -O only if outputting to a regular file.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3006,42 +2975,42 @@ msgid "" msgstr "" "-k can be used together with -O only if outputting to a regular file.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Gagal untuk meng-unlink symlink %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: tidak dapat menemukan alamat dari %s\n" -#: src/main.c:2008 +#: src/main.c:2017 #, fuzzy, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Tidak ada URLs yang ditemukan dalam %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Tidak dapat menghapus %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3052,7 +3021,7 @@ msgstr "" "Total wall clock time: %s\n" "Terambil: %d berkas, %s dalam %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Download quota dari %s TERLEWATI!\n" @@ -3211,105 +3180,105 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Menghapus %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Melanjutkan di background.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Melanjutkan di background, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Keluaran akan ditulis ke %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() failed\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() failed\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Tidak dapat mencari driver socket yang berguna.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() failed. The socket could not be set as blocking.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: peringatan: %s token terlihat sebelum nama mesin lainnya\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: token tidak diketahui \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Penggunaan: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: tidak dapat melihat statistik %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "PERINGATAN: menggunakan nilai random yang lemah.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Tidak dapat seed PRNG; pertimbangkan menggunakan --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" "%s: Tidak dapat memverifikasi sertifikat %s, yang diterbitkan oleh %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Tidak dapat untuk memverifikasi atoritas penerbit secara lokal.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Selft-signed sertifikat ditemukan.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Sertifikat yang diterbitkan tidak sah.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Sertifikat yang diterbikan telah expired.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3318,7 +3287,7 @@ msgstr "" "%s: nama pengguna sertifikat\n" "\ttidak cocok dengan yang diberikan oleh hostname %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3326,7 +3295,7 @@ msgstr "" " %s: nama pengguna sertifikat %s tidak cocok dengan yang diberikan oleh " "hostname %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3337,13 +3306,13 @@ msgstr "" " Ini mungkin merupakan indikasi bahwa host bukan yang dimaksud\n" " (mungkin ini bukan %s sesungguhnya).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Untuk menghubungi %s secara tidak secure, gunakan `--no-check-certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3352,7 +3321,7 @@ msgstr "" "\n" "%*s[ melewatkan %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3360,22 +3329,22 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " %s lagi" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " dalam " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Tidak dapat memperoleh REALTIME clock frequency: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Menghapus %s karena ini seharusnya direject.\n" @@ -3389,22 +3358,22 @@ msgstr "Tidak dapat membuka %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Menload file robot.txt; tolong hiraukan kesalahan.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Salah dalam parsing proxy URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Salah dalam proxy URL %s: Harus berupa HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirections exceeded.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3412,7 +3381,7 @@ msgstr "" "Menyerah.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3420,126 +3389,126 @@ msgstr "" "Mencoba lagi.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Tidak ada kesalahan" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Skema tidak didukung %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Skema hilang" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Host name tidak valid" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Nomor port tidak baik" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "User name tidak valid" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Alamat numerik IPv6 tidak diselesaikan" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Pengalamatan IPv6 tidak disupport" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Alamat numerik IPv6 tidak valid" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "dukungan HTTPS tidak dikompilasi dalam versi ini" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Tidak lengkap atau tidak valid urutan multibyte ditemui\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Gagal untuk mengalokasikan memori yang mencukupi; kehabisan memori.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Gagal untuk mengalokasikan %ld bytes; kehabisan memori.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: penyangga teks terlalu besar (%ld bytes), membatalkan.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Melanjutkan di background, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Gagal untuk meng-unlink symlink %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Gagal untuk meng-unlink symlink %s: %s\n" +msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Tidak dapat memperoleh cookie untuk %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Tidak dapat memperoleh cookie untuk %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: tidak dapat menemukan alamat dari %s\n" +msgstr "ERROR: Failed to open cert %s: (%d).\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Tidak dapat memperoleh cookie untuk %s\n" +msgstr "Gagal untuk meng-unlink symlink %s: %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Invalid regular expression %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Error menulis ke %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3622,6 +3591,31 @@ msgstr "Tidak dapat menulis ke WARC.\n" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "Found exact match in CDX file. Saving revisit record to WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan '--%s' tidak memperbolehkan sebuah argumen\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: pilihan '--%s' tidak diketahui\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan '-W %s' tidak memperbolehkan sebuah argumen\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "idn_decode gagal (%d):%s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s diterima.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "File `%s' sudah ada disana; tidak diambil.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3642,20 +3636,6 @@ msgstr "Found exact match in CDX file. Saving revisit record to WARC.\n" #~ "Ditemukan %d link rusak.\n" #~ "\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: URL tidak valid %s: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "idn_decode gagal (%d):%s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s diterima.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Authorisasi gagal.\n" diff --git a/po/it.gmo b/po/it.gmo index ecb82df..9ea3f45 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index a92a845..0317a82 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-20 16:22+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Poedit 2.0beta2\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -29,7 +29,7 @@ msgstr "Errore di sistema sconosciuto" msgid "Address family for hostname not supported" msgstr "Famiglia indirizzo del nome host non supportata" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Risoluzione del nome temporaneamente non riuscita" @@ -97,70 +97,45 @@ msgstr "Interrotto da un segnale" msgid "Parameter string not correctly encoded" msgstr "Stringa del parametro non codificata correttamente" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Errore sconosciuto" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'opzione \"%s\" è ambigua; possibilità:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'opzione \"%s\" è ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: l'opzione \"%s\" è ambigua; possibilità:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opzione \"%c%s\" non riconosciuta\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'opzione \"%s\" richiede un argomento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opzione \"--%s\" non riconosciuta\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opzione \"%c%s\" non riconosciuta\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opzione non valida -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: l'opzione \"-W %s\" è ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: l'opzione \"%s\" richiede un argomento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -180,13 +155,13 @@ msgstr "%s: l'opzione \"%s\" richiede un argomento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "\"" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "\"" @@ -258,28 +233,28 @@ msgstr "Espressione regolare troppo grande" msgid "Unmatched ) or \\)" msgstr ") o \\) senza corrispondenza" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Nessuna espressione regolare precedente" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "impossibile creare la pipe" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "sotto-processo %s non riuscito" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle non riuscita" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "impossibile ripristinare fd %d: dup2 non riuscita" @@ -298,55 +273,55 @@ msgstr "il sotto-processo %s ha ricevuto il segnale %d" msgid "memory exhausted" msgstr "memoria esaurita" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: impossibile risolvere l'indirizzo di bind %s; bind disabilitato.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Connessione a %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Connessione a %s:%d..." -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Connessione a [%s]:%d..." -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" "Chiamata setsockopt SO_RCVBUF non riuscita: %s\n" "\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "connesso.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "non riuscito: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: impossibile risolvere l'indirizzo dell'host %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" "Chiamata setsockopt SO_REUSEADDR non riuscita: %s\n" "\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,178 +357,178 @@ msgstr "Impossibile rimuovere %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Impossibile fare il backup di %s in %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Impossibile ottenere il cookie per %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Errore di sintassi in Set-Cookie: %s alla posizione %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie proveniente da %s ha tentato di impostare il dominio a " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Impossibile aprire il file dei cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Errore scrivendo in %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Errore chiudendo %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Tipo di elencazione non gestito, si prova un parser di elencazioni Unix.\n" # FIXME: su o presso? -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indice della directory /%s su %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "data sconosciuta " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "File " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Directory " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Collegam. " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Incerto " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Lunghezza: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) rimanenti" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s rimanenti" # FIXME -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (non autorevole)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Impossibile inizializzare SSL, verrà disabilitato." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Accesso come utente %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "" "Errore nella risposta del server, chiusura della connessione di controllo.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Errore nel codice di benvenuto del server.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Scrittura non riuscita, chiusura della connessione di controllo.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Il server rifiuta l'accesso.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Accesso non corretto.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Accesso eseguito.\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Il server non ha accettato il comando \"PBSZ 0\".\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Il server non ha accettato il comando \"PROT %c\".\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Errore del server, impossibile determinare il tipo di sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "fatto. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "fatto.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo \"%c\" sconosciuto, chiusura della connessione di controllo.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "fatto. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD non necessario.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Raggiunta sezione logicamente impossibile in getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -564,7 +539,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -573,39 +548,39 @@ msgstr "" "La directory %s non esiste.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD non necessario.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Il file è già stato scaricato.\n" # GB: initiate = inizializzare -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Impossibile iniziare il trasferimento PASV.\n" # GB: parse = comprendere -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Impossibile analizzare la risposta PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "impossibile connettersi a %s porta %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Errore di bind (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT non valido.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -613,17 +588,17 @@ msgstr "" "\n" "REST non riuscito, riavvio da capo.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Il file %s esiste.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Il file %s non esiste.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -632,7 +607,7 @@ msgstr "" "Il file %s non esiste.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -641,40 +616,40 @@ msgstr "" "Il file o la directory %s non esiste.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s è venuto in esistenza.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, chiusura della connessione di controllo.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Connessione dati: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Connessione di controllo chiusa.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Trasferimento dati interrotto.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Il file %s è già presente, non viene scaricato.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(tentativo:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -683,7 +658,7 @@ msgstr "" "%s (%s) - scritto su stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -692,34 +667,34 @@ msgstr "" "%s (%s) - %s salvato [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Rimozione di %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Usato %s come file di elenco temporaneo.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s rimosso.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "La profondità di ricorsione %d eccede il massimo (%d).\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Il file remoto è più vecchio del file locale %s -- non viene scaricato.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -727,7 +702,7 @@ msgid "" msgstr "" "Il file remoto è più recente del file locale %s -- scaricamento in corso.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -736,11 +711,11 @@ msgstr "" "Le dimensioni non coincidono (locale %s) -- scaricamento in corso.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Il nome del collegamento simbolico non è valido, saltato.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -749,248 +724,248 @@ msgstr "" "Collegamento simbolico già esistente %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creazione del collegamento simbolico %s → %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Collegamenti simbolici non gestiti, collegamento %s saltato.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Directory %s saltata.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo di file sconosciuto/non gestito.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "" "Impossibile impostare i permessi per %s.\n" "\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: time-stamp danneggiato.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Le directory non verranno scaricate perché la loro profondità è %d (max " "%d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Non si discende nella directory %s perché è esclusa/non inclusa.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s rifiutato.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Errore nella corrispondenza di %s con %s: %s.\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Nessun corrispondenza con il modello %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Indice in formato HTML scritto in %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Indice in formato HTML scritto in %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERRORE: Impossibile aprire la directory %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERRORE: Impossibile aprire il certificato %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" "Caricato certificato CA \"%s\"\n" "\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERRORE: Impossibile caricare il file CRL \"%s\": (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Caricato il file CRL \"%s\"\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ERRORE: GnuTLS richiede che la chiave e la certificazione siano dello stesso " "tipo.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: valore %d dell'opzione \"secure-protocol\" non implementata\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Segnalare questo problema a bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: valore %d dell'opzione \"secure-protocol\" non implementata\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERRORE" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVVERTIMENTO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: nessun certificato presentato da %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: il certificato di %s non è fidato.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: il certificate di %s non ha un emittente conosciuto.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Il certificato di %s è stato revocato.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: il firmatario del certificato %s non è una CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: il certificato di %s non è stato firmato con un algoritmo sicuro.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: il certificato di %s non è stato ancora attivato.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Il certificato di %s è scaduto.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Errore durante l'inizializzazione del certificato X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Nessun certificato trovato\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Errore analizzando il certificato: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Il certificato non è ancora stato attivato\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Il certificato è scaduto\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" "Il proprietario del certificato non corrisponde al nome dell'host %s.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "La chiave pubblica non corrisponde a quella selezionata.\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Il certificato deve essere X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Errore nel gestire l'elenco indirizzi.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Host sconosciuto" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Risoluzione di %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "non riuscito: nessun indirizzo IPv4/IPv6 per l'host.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "non riuscito: tempo scaduto.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: impossibile risolvere il collegamento incompleto %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL non valido %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Scrittura della richiesta HTTP non riuscita: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Nessuna intestazione, si assume HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -999,11 +974,11 @@ msgstr "" "Il file %s è già presente, non viene scaricato.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime non riuscita, potrebbe essere un bug.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1011,55 +986,55 @@ msgstr "" "Impossibile convertire la marcatura temporale nel formato http. Viene usato " "il tempo 0 come ultima data di modifica.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "File dati %s del BODY mancante: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Riutilizzo della connessione esistente a [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Riutilizzo della connessione esistente a %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lettura della risposta del proxy non riuscita: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRORE %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Riga di stato malformata" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunnel proxy non riuscito: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Schema di autenticazione sconosciuto.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Autenticazione selezionata: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Salvataggio in: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1068,21 +1043,21 @@ msgstr "" "Nello scaricare la firma:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Impossibile leggere il contenuto della firma dal file temporaneo, saltato.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Impossibile creare un file temporaneo: scaricamento firma saltato.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valore pri non valido, viene ipotizzato %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1090,43 +1065,43 @@ msgstr "" "Impossibile trovare un digest valido per le risorse Metalink.\n" "Verranno ignorate.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL disabilitato a causa di errori.\n" # NdT: %s qui può essere HTTP -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Richiesta %s inviata, in attesa di risposta... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Nessun dato ricevuto.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Errore di lettura nelle intestazioni (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(nessuna descrizione)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Posizione: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "non specificato" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [segue]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1135,7 +1110,7 @@ msgstr "" "File %s non modificato sul server, non viene scaricato.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1146,7 +1121,7 @@ msgstr "" "Aggiungere l'opzione --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1156,58 +1131,58 @@ msgstr "" " Il file è già interamente scaricato; niente da fare.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Lunghezza: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorato" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Attenzione: i metacaratteri non sono supportati in HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modalità spider abilitata. Controllare se il file remoto esiste.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Impossibile scrivere in %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Manca un attributo richiesto nello header ricevuto.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticazione nome utente/password non riuscita.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Impossibile scrivere nel file WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Impossibile scrivere nel file WARC temporaneo.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Impossibile stabilire una connessione SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Impossibile rimuovere %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRORE: ridirezione (%d) senza posizione di destinazione.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1215,25 +1190,25 @@ msgstr "" "Impossibile trovare dati Metalink nella risposta HTTP. Il file viene " "scaricato con HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Trovata intestazione Metalink: attivata la modalità Metalink.\n" # FIXME -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Il file remoto non esiste -- collegamento rotto!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Intestazione Last-modified mancante -- time-stamp disattivati.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Intestazione Last-modified non valido -- time-stamp ignorato.\n" # Perché "server file" e non "remote file"? C'è differenza? -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1241,16 +1216,16 @@ msgid "" msgstr "" "Il file del server è più vecchio del file locale %s -- non viene scaricato.\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Le dimensioni non coincidono (locale %s) -- scaricamento in corso.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Il file remoto è più recente, scaricamento in corso.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1259,14 +1234,14 @@ msgstr "" "Il file remoto esiste e potrebbe contenere collegamenti ad altre risorse -- " "scaricamento in corso.\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" "Il file remoto esiste ma non contiene collegamenti -- non viene scaricato.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1275,18 +1250,18 @@ msgstr "" "Il file remoto esiste e potrebbe contenere ulteriori collegamenti,\n" "ma la ricorsione è disabilitata -- non viene scaricato.\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" msgstr "Il file remoto esiste.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1295,7 +1270,7 @@ msgstr "" "%s (%s) - scritto su stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1304,58 +1279,58 @@ msgstr "" "%s (%s) - %s salvato [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Connessione chiusa al byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Errore di lettura al byte %s (%s). " -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Errore di lettura al byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Qualità di protezione \"%s\" non gestita.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmo \"%s\" non supportato.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC punta a %s, che non esiste.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: impossibile leggere %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: errore in %s alla riga %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: errore di sintassi in %s alla riga %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: comando sconosciuto %s in %s alla riga %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1367,7 +1342,7 @@ msgstr "" "\"%s\"\n" "o specificare un altro file utilizzando --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1378,50 +1353,50 @@ msgstr "" "\"%s\"\n" "o specificare un altro file utilizzando --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Attenzione: il file wgetrc di sistema e quello personale puntano " "entrambi a %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: comando %s passato a --execute non valido\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: valore booleano %s non valido, usare \"on\" oppure \"off\".\n" # FIXME: boolean: booleano? logico? -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: %s non valido, usare \"on\", \"off\" oppure \"quiet\".\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: numero %s non valido.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s può essere usata solo una volta\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: valore di byte %s non valido\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: periodo di tempo %s non valido\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1431,28 +1406,28 @@ msgstr "" "come WGET_ASKPASS o SSH_ASKPASS.\n" "\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: valore %s non valido.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: intestazione %s non valida.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: intestazione WARC %s non valida.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: tipo di avanzamento %s non valido.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1461,40 +1436,40 @@ msgstr "" "%s: %s: restrizione %s non valida,\n" " usare [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Codifica %s non valida\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Conversione da %s a %s non supportata\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Incontrata sequenza multibyte incompleta o non valida\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Codice di errore %d non gestito\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: locale non impostata\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode non riuscita (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Conversione in minuscolo non riuscita: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1503,17 +1478,17 @@ msgstr "" "\n" "L'output viene inviato su %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; registrazione disabilitata.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uso: %s [OPZIONI]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1522,69 +1497,69 @@ msgstr "" "corte.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Avvio:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version Visualizza la versione ed esce\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help Stampa questo aiuto\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background Va in background dopo l'avvio\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMANDO Esegue COMANDO come se fosse scritto " "in\n" " \".wgetrc\"\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "File di registro e di input:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE Registra i messaggi su FILE\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE Accoda i messaggi su FILE\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug Stampa le informazioni di debug\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug Stampa le informazioni di debug " "Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet Silenzioso (nessun output)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose Prolisso (predefinito)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose Meno prolisso, ma non silenzioso\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1592,7 +1567,7 @@ msgstr "" " --report-speed=TIPO Banda in uscita definita come TIPO\n" " (può essere \"bits\")\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1601,7 +1576,7 @@ msgstr "" "o\n" " esterno\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1610,12 +1585,12 @@ msgstr "" "metalink\n" " locale o esterno\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html Tratta il file di input come HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1624,29 +1599,29 @@ msgstr "" "di\n" " input (-i -F) come relativi all'URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FILE Specifica il file di configurazione da\n" " usare\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config Non legge alcun file di configurazione\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FILE Registra i motivi per cui gli URL sono\n" " stati rifiutati su FILE\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Scaricamento:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1654,18 +1629,18 @@ msgstr "" " -t, --tries=NUMERO Imposta il NUMERO di tentativi\n" " (0 = illimitati)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused Riprova anche se la connessione è\n" " rifiutata\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=FILE Scrive i documenti su FILE\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1673,7 +1648,7 @@ msgstr "" " -nc, --no-clobber Non avvia lo scaricamento di file già\n" " esistenti (soprascrivendoli)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1681,7 +1656,7 @@ msgid "" msgstr "" " --no-config Non legge alcun file di configurazione\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1690,7 +1665,7 @@ msgstr "" "parzialmente\n" " scaricato\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1698,13 +1673,13 @@ msgstr "" " --start-pos=OFFSET Avvia lo scaricamento alla posizione a\n" " base zero OFFSET\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPO Sceglie il TIPO di misurazione\n" " dell'avanzamento\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1712,7 +1687,7 @@ msgstr "" " --show-progress Visualizza la barra di avanzamento in\n" " qualsiasi modo prolisso\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1721,7 +1696,7 @@ msgstr "" " -N, --timestamping Non scarica file più vecchi di quelli\n" " locali\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1731,7 +1706,7 @@ msgstr "" "nella\n" " modalità timestamping\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1740,20 +1715,20 @@ msgstr "" "con\n" " quello del server\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response Stampa la risposta del server\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider Non scarica niente\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDI Imposta tutti i timeout a SECONDI\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1762,7 +1737,7 @@ msgstr "" " (separati da virgole)\n" "\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1770,32 +1745,32 @@ msgstr "" " --bind-dns-address=INDIRIZZO Lega il risolutore DNS a INDIRIZZO\n" " (nome host o IP) all'host locale\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECONDI Imposta il timeout per la risoluzione " "del\n" " DNS a SECONDI\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECONDI Imposta il timeout di connessione a\n" " SECONDI\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECONDI Imposta il timeout di lettura a " "SECONDI\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDI Aspetta SECONDI tra i vari " "scaricamenti\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1803,7 +1778,7 @@ msgstr "" " --waitretry=SECONDI Aspetta 1...SECONDI tra i tentativi di\n" " scaricamento\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1812,19 +1787,19 @@ msgstr "" "secondi\n" " tra gli scaricamenti\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy Disattiva esplicitamente l'uso del " "proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NUMERO Imposta la quota di scaricamento a " "NUMERO\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1833,19 +1808,19 @@ msgstr "" "all'host\n" " locale\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=VELOCITÀ Limita la velocità di scaricamento a\n" " VELOCITÀ\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache Disattiva la cache di risoluzione del " "DNS\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1855,7 +1830,7 @@ msgstr "" "SO\n" " indicato\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1863,17 +1838,17 @@ msgstr "" " --ignore-case Ignora maiuscole/minuscole in file e\n" " directory\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" " -4, --inet4-only Si connette solo a indirizzi IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" " -6, --inet6-only Si connette solo a indirizzi IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1883,24 +1858,24 @@ msgstr "" " FAMIGLIA specificata (IPv6, IPv4 o " "none)\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=UTENTE Imposta il nome utente ftp e http a " "UTENTE\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PASSWORD Imposta la password ftp e http a " "PASSWORD\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password Chiede la password\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1920,30 +1895,30 @@ msgstr "" "WGET_ASKPASS\n" " o SSH_ASKPASS\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri Disattiva la gestione di IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=COD Usa COD come codifica locale per gli " "IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=COD Usa COD come codifica remota " "predefinita\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink Rimuove il file prima di sovrascrivere\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1952,7 +1927,7 @@ msgstr "" " controllo non corrisponde\n" " (appende .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1961,7 +1936,7 @@ msgstr "" "Metalink\n" " application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1970,7 +1945,7 @@ msgstr "" "intestazioni\n" " nella risposta HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1978,7 +1953,7 @@ msgstr "" " --preferred-location Posizione preferita per le risorse\n" " Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1987,33 +1962,33 @@ msgstr "" "metadati\n" " negli attributi estesi del file\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Directory:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories Non crea directory\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories Forza la creazione di directory\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories Non crea le directory host\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories Usa il nome del protocollo nelle " "directory\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFISSO Salva i file in PREFISSO/...\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2022,26 +1997,26 @@ msgstr "" "directory\n" " remote\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opzioni HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UTENTE Imposta l'utente http a UTENTE\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-passwd=PASSWORD Imposta la password http a PASSWORD\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache Non permette la cache dei dati lato\n" " server\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2050,7 +2025,7 @@ msgstr "" "predefinita\n" " (solitamente \"index.html\")\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2058,19 +2033,19 @@ msgstr "" " -E, --adjust-extension Salva i documenti HTML/CSS con\n" " l'estensione corretta\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length Ignora il campo Content-Length nelle\n" " intestazioni\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRINGA Inserisce STRINGA tra le intestazioni\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2079,26 +2054,26 @@ msgstr "" " --progress=TIPO Sceglie il TIPO di misurazione\n" " dell'avanzamento\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect Numero massimo di ridirezioni per " "pagina\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UTENTE Imposta il nome utente per il proxy a\n" " UTENTE\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-passwd=PASSWORD Imposta la password per il proxy a\n" " PASSWORD\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2107,12 +2082,12 @@ msgstr "" "\"\n" " nella richiesta HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers Salva le intestazioni HTTP su file\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2121,7 +2096,7 @@ msgstr "" "come\n" " Wget/VERSIONE\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2130,24 +2105,24 @@ msgstr "" "(connessioni\n" " persistenti)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies Non usa i cookie\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FILE Carica i cookie da FILE prima della\n" " sessione\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FILE Salva i cookie su FILE dopo la " "sessione\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2156,7 +2131,7 @@ msgstr "" "sessione\n" " (non permanenti)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2165,7 +2140,7 @@ msgstr "" "come\n" " dati\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2174,13 +2149,13 @@ msgstr "" "del\n" " FILE\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=METODOHTTP Usa METODOHTTP nell'intestazione\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2188,7 +2163,7 @@ msgstr "" " --body-data=STRINGA Invia STRINGA come dati, --method deve\n" " essere impostato\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2197,7 +2172,7 @@ msgstr "" "deve\n" " essere impostato\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2210,7 +2185,7 @@ msgstr "" "locali\n" " (SPERIMENTALE)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2218,7 +2193,7 @@ msgstr "" " --content-on-error Mostra i contenuti ricevuti quando si\n" " verificano errori lato server\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2231,11 +2206,11 @@ msgstr "" "richiesta\n" " dal server\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opzioni HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2245,42 +2220,42 @@ msgstr "" " --secure-protocol=PROT Sceglie il protocollo sicuro; uno tra\n" " auto, SSLv2, SSLv3, TLSv1 e PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only Segue solo i collegamenti HTTPS sicuri\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate Non verifica il certificato del server\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE File certificato del client\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TIPO Tipo di certificato del client, PEM o " "DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE File della chiave privata\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TIPO Tipo di chiave privata, PEM o DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FILE File con il bundle dei CA\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2289,11 +2264,11 @@ msgstr "" "delle\n" " Autorità di Certificazione (CA)\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FILE File con il bundle dei CRL\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2309,7 +2284,7 @@ msgstr "" " separati da \";\" per verificare i " "nodi\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2318,7 +2293,7 @@ msgstr "" "inizializzare\n" " SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2326,15 +2301,15 @@ msgstr "" " --egd-file=FILE File col nome del socket EGD con dati\n" " casuali\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Opzioni HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts Disabilita HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2342,11 +2317,11 @@ msgstr "" " --hsts-file Percorso al database HSTS\n" " (soprascrive quello predefinito)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opzioni FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2355,26 +2330,26 @@ msgstr "" "FTP\n" " binari\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=UTENTE Imposta l'utente ftp a UTENTE\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS Imposta la password ftp a PASS\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing Non elimina i file \".listing\"\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob Disabilita il \"globbing\" FTP sui nomi " "dei\n" " file\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" @@ -2382,12 +2357,12 @@ msgstr "" "trasferimento\n" " passiva\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions Preserva i permessi remoti dei file\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2397,11 +2372,11 @@ msgstr "" " dai collegamenti simbolici quando in\n" " modalità ricorsiva\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Opzioni FTP:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2409,7 +2384,7 @@ msgstr "" " --ftps-implicit Usa FTPS implicito\n" " (porta predefinita a 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2419,7 +2394,7 @@ msgstr "" " nella connessione di controllo quando\n" " viene aperta una connessione dati\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2428,7 +2403,7 @@ msgstr "" "controllo,\n" " tutti i dati saranno in chiaro\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2436,11 +2411,11 @@ msgstr "" " --ftps-fallback-to-ftp Usa FTP se FTPS non è supportato dal\n" " server\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opzioni WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2449,24 +2424,24 @@ msgstr "" "file\n" " .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRINGA Inserisce STRINGA nel record warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMERO Imposta la dimensione massima dei file\n" " WARC a NUMERO\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx Scrive file indice CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2475,17 +2450,17 @@ msgstr "" "file\n" " CDX specificato\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression Non comprime i file WARC con GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests Non calcola i digest SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2493,7 +2468,7 @@ msgstr "" " --no-warc-keep-log Non archivia il file di registro in un\n" " record WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2503,15 +2478,15 @@ msgstr "" "creati\n" " dal processo di scrittura WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Scaricamento ricorsivo:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive Scaricamento ricorsivo\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2519,7 +2494,7 @@ msgstr "" " -l, --level=NUMERO Profondità massima di ricorsione\n" " (inf o 0 = illimitata)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2527,7 +2502,7 @@ msgstr "" " --delete-after Elimina localmente i file dopo averli\n" " scaricati\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2537,7 +2512,7 @@ msgstr "" "CSS a\n" " file locali\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2545,7 +2520,7 @@ msgstr "" " --convert-file-only Converte solo la parte del file degli\n" " URL (nota anche come basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2553,7 +2528,7 @@ msgstr "" " --backups=N Prima di salvare il file X, torna a N\n" " backup precedenti\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2561,7 +2536,7 @@ msgstr "" " -K, --backup-converted Salva il file X come X_orig prima di\n" " convertirlo\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2569,7 +2544,7 @@ msgstr "" " -K, --backup-converted Salva il file X come X.orig prima di\n" " convertirlo\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2577,7 +2552,7 @@ msgstr "" " -m, --mirror Scorciatoia per:\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2586,7 +2561,7 @@ msgstr "" " necessarie per visualizzare la pagina " "HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2595,11 +2570,11 @@ msgstr "" "strict\n" " (SGML)\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Accetto/Rifiuto ricorsivo:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2608,7 +2583,7 @@ msgstr "" "estensioni\n" " accettate\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2617,51 +2592,51 @@ msgstr "" "estensioni\n" " rifiutate\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX Espressione regolare per gli URL da\n" " accettare\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX Espressione regolare per gli URL da\n" " rifiutare\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TIPO Tipo di espressione regolare\n" " (posix o pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TIPO Tipo di espressione regolare (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=ELENCO Elenco separato da virgole di domini\n" " accettati\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=ELENCO Elenco separato da virgole di domini\n" " rifiutati\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp Segue i collegamenti FTP dai documenti\n" " HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2670,7 +2645,7 @@ msgstr "" "che\n" " vengono seguiti\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2679,23 +2654,23 @@ msgstr "" "che\n" " vengono ignorati\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts Visita anche altri host quando in " "modalità\n" " ricorsiva\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative Segue solo i collegamenti relativi\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=ELENCO Elenco di directory consentite\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2704,86 +2679,86 @@ msgstr "" " --trust-server-names Usa il nome indicato dall'ultimo\n" " componente dell'URL di re-direzione\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=ELENCO Elenco di directory non consentite\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent Non risale alla directory superiore\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Inviare segnalazioni di bug e suggerimenti a \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, un programma non interattivo per scaricare file dalla rete.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Password per l'utente %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Password: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Impossibile creare la pipe\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Errore nell'inizializzare le azioni di spawn del file per use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Errore nell'impostare le azioni di spawn del file per use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Errore nel leggere la risposta dal comando \"%s %s\": %s\\\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Nome utente per \"%s%s\": " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Password per \"%s%s@%s\": " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Compilazione: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Collegamento: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2792,29 +2767,29 @@ msgstr "" "GNU Wget %s compilato su %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (utente)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2828,7 +2803,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2836,36 +2811,36 @@ msgstr "" "\n" "Scritto da Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Inviare segnalazioni di bug e suggerimenti a .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problema di allocazione di memoria\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Uscita causata dall'errore in %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Usare \"%s --help\" per ulteriori opzioni.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opzione illecita -- \"-n%c\"\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Supporto al debug non attivato, --debug verrà ignorato.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2874,7 +2849,7 @@ msgstr "" "Specificati sia --no-clobber che --convert-links, solo --convert-links verrà " "usato.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2883,23 +2858,23 @@ msgstr "" "Specificati sia --no-clobber che --convert-links, solo --convert-file-only " "verrà usato.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Impossibile essere prolisso e silenzioso allo stesso tempo.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Impossibile registrare le date senza allo stesso tempo modificare i file.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Impossibile specificare --inet4-only e --inet6-only simultaneamente.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2914,7 +2889,7 @@ msgstr "" "\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2924,7 +2899,7 @@ msgstr "" "verrà messo nel singolo file specificato.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2934,12 +2909,7 @@ msgstr "" "O.\n" "Consultare il manuale per maggiori dettagli.\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Il file \"%s\" è già presente, non viene scaricato.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2947,7 +2917,7 @@ msgstr "" "L'output WARC non funziona con --no-clobber: --no-clobber verrà " "disabilitata.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2955,12 +2925,12 @@ msgstr "" "L'output WARC non funziona con la registrazione delle date: verrà " "disabilitata.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "L'output WARC non funziona con --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2969,7 +2939,7 @@ msgstr "" "L'output WARC non funziona con --continue o --start-pos: verranno " "disabilitati.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2977,7 +2947,7 @@ msgstr "" "I digest sono disabilitati: la de-duplicazione WARC non rileverà record " "duplicati.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2986,12 +2956,12 @@ msgstr "" "L'output WARC non funziona con --continue o --start-pos: verranno " "disabilitati.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Impossibile specificare --ask-password e --password simultaneamente.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3000,17 +2970,17 @@ msgstr "" "Specificare sia --start-pos che --continue non è consigliato: --continue " "verrà disabilitato.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL mancante\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Impossibile specificare --post-data e --post-file simultaneamente.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3019,7 +2989,7 @@ msgstr "" "Impossibile usare --post-data o --post-file assieme a --method. --method " "richiede i dati tramite le opzioni --body-data e --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3028,24 +2998,24 @@ msgstr "" "È necessario specificare attraverso --method=HTTPMethod un metodo da " "utilizzare con --body-data o --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Impossibile specificare --body-data e --body-file simultaneamente.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Questa versione non gestisce gli IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k o -r può essere usato con -O solo in scrittura su un file regolare.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3054,48 +3024,48 @@ msgstr "" "--convert-links o --convert-file-only possono essere usati assieme solo in " "scrittura su un file regolare.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" "Inizializzazione di libcares non riuscita\n" "\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Inizializzazione del canale c-ares non riuscita\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" "Analisi dell'indirizzo IP \"%s\" non riuscita\n" "\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" "Impostazione non riuscita del server DNS \"%s\" (%d)\n" "\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nessun URL trovato in %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Impossibile analizzare il file metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Impossibile scaricare tutte le risorse da %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3106,7 +3076,7 @@ msgstr "" "Tempo totale: %s\n" "Scaricati: %d file, %s in %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota di scaricamento di %s SUPERATA!\n" @@ -3272,109 +3242,109 @@ msgstr "Recuperato il file %s, ma la firma non corrisponde.\n" msgid "Renaming %s to %s.\n" msgstr "%s viene rinominato in %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Prosecuzione in background.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Prosecuzione in background, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "L'output sarà scritto su %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() non riuscita\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() non riuscita\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: impossibile trovare un driver per i socket utilizzabile.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "ioctl() non riuscita. Il socket non può essere impostato come bloccante.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: attenzione: %s appare prima di un nome di macchina\n" # token: termine? -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: termine \"%s\" sconosciuto\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: stat di %s non riuscita: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "ATTENZIONE: si sta usando un seme casuale debole.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Impossibile inizializzare PRNG; considerare l'utilizzo di --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" "La versione installata di OpenSSL è troppo vecchia per supportare TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" "La versione installata di OpenSSL è troppo vecchia per supportare TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: valore %d dell'opzione \"secure-protocol\" non implementata\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: impossibile verificare il certificato di %s, rilasciato da %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Impossibile verificare localmente l'autorità dell'emittente.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Trovato certificato auto-firmato.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Il certificato rilasciato non è ancora valido.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Il certificato rilasciato è scaduto.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3383,7 +3353,7 @@ msgstr "" "%s: nessuno dei nomi alternativi indicati nel certificato corresponde al\n" " nome dell'host richiesto %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3391,7 +3361,7 @@ msgstr "" " %s: il nome comune di certificato %s non corrisponde al nome dell'host\n" " richiesto %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3403,13 +3373,13 @@ msgstr "" " Questo può indicare che l'host non è chi si dichiara di essere\n" " (cioè non è il vero %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Per connettersi a %s in modo non sicuro, usare \"--no-check-certificate\".\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3426,29 +3396,29 @@ msgstr "" # When using the dotted retrieval, you may also set the style by # specifying the type as dot:style. # -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Stile di progresso %s non valido; lasciato invariato.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " prev %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " in " # FIXME -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Impossibile ottenere la frequenza di clock REALTIME: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Rimozione di %s poiché deve essere rifiutato.\n" @@ -3462,22 +3432,22 @@ msgstr "Impossibile aprire %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Caricamento di robots.txt; ignorare eventuali errori.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Errore analizzando l'URL del proxy %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Errore nell'URL del proxy %s: deve essere HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "superate %d ridirezioni.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3485,7 +3455,7 @@ msgstr "" "Rinuncio.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3493,136 +3463,136 @@ msgstr "" "Altro tentativo in corso.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Nessun errore" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Schema %s non gestito" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schema mancante" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Nome dell'host non valido" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Numero di porta non valido" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Nome utente non valido" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Indirizzo numerico IPv6 non terminato" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Indirizzo IPv6 non supportato" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Indirizzo numerico IPv6 non valido" # FIXME -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Gestione di HTTPS non compilata" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Incontrata sequenza multibyte incompleta o non valida\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: allocazione di memoria non riuscita; memoria esaurita.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: allocazione di %ld byte non riuscita; memoria esaurita.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: buffer di testo troppo grande (%d byte), interruzione.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Prosecuzione in background, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Rimozione del collegamento simbolico %s non riuscita: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "" "Inizializzazione di libcares non riuscita\n" "\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "" "Impossibile impostare i permessi per %s.\n" "\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" "Impossibile impostare i permessi per %s.\n" "\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "" "Analisi dell'indirizzo IP \"%s\" non riuscita\n" "\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "" "Impossibile impostare i permessi per %s.\n" "\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Espressione regolare %s non valida, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Errore cercando la corrispondenza %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3702,6 +3672,24 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Trovata corrispondenza esatta nel file CDX. Salvataggio record su WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opzione \"--%s\" non riconosciuta\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: l'opzione \"-W %s\" è ambigua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: l'opzione \"%s\" richiede un argomento\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Il file \"%s\" è già presente, non viene scaricato.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/ja.gmo b/po/ja.gmo index 8ef393a..d818a33 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index af756ab..549e919 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-18 19:20+0900\n" "Last-Translator: Hiroshi Takekawa \n" "Language-Team: Japanese \n" @@ -19,7 +19,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=0;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ã§ã™" @@ -27,7 +27,7 @@ msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ã§ã™" msgid "Address family for hostname not supported" msgstr "ホストåã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒ•ã‚¡ãƒŸãƒªãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "åå‰è§£æ±ºä¸­ã«ä¸€æ™‚çš„ãªå¤±æ•—ãŒç™ºç”Ÿã—ã¾ã—ãŸ" @@ -95,70 +95,45 @@ msgstr "シグナルã«ã‚ˆã£ã¦ä¸­æ–­ã•ã‚Œã¾ã—ãŸ" msgid "Parameter string not correctly encoded" msgstr "パラメータ文字列ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™ã€‚é¸æŠžè‚¢ã¯æ¬¡ã®é€šã‚Šã§ã™:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã›ã‚“\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™ã€‚é¸æŠžè‚¢ã¯æ¬¡ã®é€šã‚Šã§ã™:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: '%c%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã›ã‚“\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: '--%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: '%c%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ä¸æ­£ãªã‚ªãƒ—ションã§ã™ -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™ -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å–ã‚Šã¾ã›ã‚“\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -178,13 +153,13 @@ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -256,28 +231,28 @@ msgstr "æ­£è¦è¡¨ç¾ãŒå¤§ãã™ãŽã¾ã™" msgid "Unmatched ) or \\)" msgstr "マッãƒã—ãªã„ ) ã‚„ \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "ã“れよりå‰ã«æ­£è¦è¡¨ç¾ã¯ã‚ã‚Šã¾ã›ã‚“" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "パイプãŒä½œæˆã§ãã¾ã›ã‚“" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s サブプロセスãŒå¤±æ•—ã—ã¾ã—ãŸ" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle ãŒå¤±æ•—ã—ã¾ã—ãŸ" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "fd %d をリストアã§ãã¾ã›ã‚“: dup2 ãŒå¤±æ•—ã—ã¾ã—ãŸ" @@ -296,53 +271,53 @@ msgstr "%s サブプロセスãŒè‡´å‘½çš„ãªã‚·ã‚°ãƒŠãƒ« %d ã‚’å—ä¿¡ã—ã¾ã— msgid "memory exhausted" msgstr "メモリä¸è¶³" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: ãƒã‚¤ãƒ³ãƒ‰ã—よã†ã¨ã—ãŸã‚¢ãƒ‰ãƒ¬ã‚¹ %s を解決ã§ãã¾ã›ã‚“ã§ã—ãŸ; ãƒã‚¤ãƒ³ãƒ‰ã‚’ç¦æ­¢ã—" "ã¾ã™ã€‚\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "%s|%s|:%d ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "%s:%d ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "[%s]:%d ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF ãŒå¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "接続ã—ã¾ã—ãŸã€‚\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "失敗ã—ã¾ã—ãŸ: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ホストアドレス %s を解決ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR ãŒå¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -378,174 +353,174 @@ msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "%s ã‚’ %s ã¨ã—ã¦ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã§ãã¾ã›ã‚“: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "%s ã®ã‚¯ãƒƒã‚­ãƒ¼ãŒå–å¾—ã§ãã¾ã›ã‚“\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Set-Cookie: %s ã®ä½ç½® %d ã«ã¯æ–‡æ³•ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™ã€‚\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "%s ã‹ã‚‰ã®ã‚¯ãƒƒã‚­ãƒ¼ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’次ã®ã‚ˆã†ã«è¨­å®šã—よã†ã¨ã—ã¾ã—ãŸã€‚" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "クッキーファイル %s ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸ: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "%s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "%s ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„リスト形å¼ã§ã™ã€UNIXå½¢å¼ã¨è¦‹ã¦è§£é‡ˆã—ã¦ã¿ã¾ã™ã€‚\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s (%s:%d 上)ã®è¦‹å‡ºã—(index)ã§ã™" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "時間ãŒä¸æ˜Žã§ã™ " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "ファイル " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "ディレクトリ " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "リンク " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "ä¸ç¢ºå®Ÿ " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s ãƒã‚¤ãƒˆ)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "é•·ã•: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) 残ã£ã¦ã„ã¾ã™" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s 残ã£ã¦ã„ã¾ã™" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (確証ã¯ã‚ã‚Šã¾ã›ã‚“)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL ã‚’åˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚SSL を無効ã«ã—ã¾ã™ã€‚" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "%s ã¨ã—ã¦ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "サーãƒã®å¿œç­”ã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚‹ã®ã§ã€æŽ¥ç¶šã‚’終了ã—ã¾ã™ã€‚\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "サーãƒã®åˆæœŸå¿œç­”ã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™ã€‚\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "書ãè¾¼ã¿ã«å¤±æ•—ã—ãŸã®ã§ã€æŽ¥ç¶šã‚’終了ã—ã¾ã™ã€‚\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "サーãƒãŒãƒ­ã‚°ã‚¤ãƒ³ã‚’æ‹’å¦ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "ログインã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "ログインã—ã¾ã—ãŸ!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "サーãƒãŒ 'PBSZ 0' コマンドをå—ã‘ã„ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "サーãƒãŒ 'PROT %c' コマンドをå—ã‘ã„ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "サーãƒã‚¨ãƒ©ãƒ¼ã§ã€ã‚·ã‚¹ãƒ†ãƒ ãŒãªã«ã‹åˆ¤åˆ¥ã§ãã¾ã›ã‚“。\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "完了ã—ã¾ã—ãŸã€‚ " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "完了ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "`%c' ã¯ä¸æ˜Žãªç¨®é¡žãªã®ã§ã€æŽ¥ç¶šã‚’終了ã—ã¾ã™ã€‚\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "完了ã—ã¾ã—ãŸã€‚ " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD ã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "getftp() ã§è«–ç†çš„ã«åˆ°é”ã—ãªã„ã¯ãšã®ã¨ã“ã‚ã«åˆ°é”ã—ã¾ã—ãŸ" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -556,7 +531,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -565,37 +540,37 @@ msgstr "" "%s ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "ファイルã¯ã™ã§ã«å–得済ã§ã™ã€‚\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "PASV転é€ã®åˆæœŸåŒ–ãŒã§ãã¾ã›ã‚“。\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "PASVã®å¿œç­”を解æžã§ãã¾ã›ã‚“。\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "%s:%d ã¸æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸ: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "ãƒã‚¤ãƒ³ãƒ‰ã‚¨ãƒ©ãƒ¼ã§ã™ (%s)。\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "無効ãªãƒãƒ¼ãƒˆç•ªå·ã§ã™ã€‚\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -603,17 +578,17 @@ msgstr "" "\n" "RESTã«å¤±æ•—ã—ã¾ã—ãŸã€æœ€åˆã‹ã‚‰å§‹ã‚ã¾ã™ã€‚\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "%s ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ãŒå­˜åœ¨ã—ã¾ã™ã€‚\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "%s ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -622,7 +597,7 @@ msgstr "" "%s ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -631,40 +606,40 @@ msgstr "" "%s ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s ãŒå­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %sã€æŽ¥ç¶šã‚’終了ã—ã¾ã™ã€‚\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - データ接続: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "制御用ã®æŽ¥ç¶šã‚’切断ã—ã¾ã™ã€‚\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "データ転é€ã‚’中断ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "ファイル %s ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(試行:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -673,7 +648,7 @@ msgstr "" "%s (%s) - stdout ã¸å‡ºåŠ›ã—ã¾ã—㟠%s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -682,35 +657,35 @@ msgstr "" "%s (%s) - %s ã¸ä¿å­˜çµ‚了 [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "%s を削除ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "リスト一時ファイル㫠%s を使用ã—ã¾ã™ã€‚\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s を削除ã—ã¾ã—ãŸã€‚\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "å†å¸°ã™ã‚‹æ·±ã• %d ãŒæœ€å¤§å€¤ã‚’超éŽã—ã¦ã„ã¾ã™ã€‚æ·±ã•ã¯ %d ã§ã™ã€‚\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "サーãƒå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚ˆã‚Šãƒ­ãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ã®æ–¹ãŒæ–°ã—ã„ã‹åŒã˜ãªã®ã§å–å¾—ã—ã¾" "ã›ã‚“。\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -719,7 +694,7 @@ msgstr "" "サーãƒå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ–¹ãŒãƒ­ãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ« %s より新ã—ã„ã®ã§å–å¾—ã—ã¾ã™ã€‚\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -728,11 +703,11 @@ msgstr "" "サイズãŒåˆã‚ãªã„ã®ã§(ローカル㯠%s)ã€å–å¾—ã—ã¾ã™ã€‚\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "ä¸æ­£ãªã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯åãªã®ã§ã€ã¨ã°ã—ã¾ã™ã€‚\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -741,241 +716,241 @@ msgstr "" "ã™ã§ã« %s -> %s ã¨ã„ã†æ­£ã—ã„シンボリックリンクãŒã‚ã‚Šã¾ã™\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "%s -> %s ã¨ã„ã†ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã‚’作æˆã—ã¦ã„ã¾ã™\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "シンボリックリンクã«å¯¾å¿œã—ã¦ã„ãªã„ã®ã§ã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ %s ã‚’ã¨ã°ã—ã¾" "ã™ã€‚\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "ディレクトリ %s ã‚’ã¨ã°ã—ã¾ã™ã€‚\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: ä¸æ˜Žãªã¾ãŸã¯å¯¾å¿œã—ã¦ã„ãªã„ファイルã®ç¨®é¡žã§ã™ã€‚\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: 日付ãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "æ·±ã•ãŒ %d (最大 %d)ãªã®ã§ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’転é€ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "除外ã•ã‚Œã¦ã„ã‚‹ã‹å«ã¾ã‚Œã¦ã„ãªã„ã®ã§ %s ã«ç§»å‹•ã—ã¾ã›ã‚“。\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s を除外ã—ã¾ã™ã€‚\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s 㯠%s ã«å¯¾ã—ã¦ãƒžãƒƒãƒã—ã¾ã›ã‚“ã§ã—ãŸ: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "パターン %s ã«é©åˆã™ã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "%s [%s]ã«HTML化ã•ã‚ŒãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’書ãã¾ã—ãŸã€‚\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "%s ã«HTML化ã•ã‚ŒãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’書ãã¾ã—ãŸã€‚\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "エラー：%s ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é–‹ã‘ã¾ã›ã‚“。\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "エラー：%s ã¨ã„ã†è¨¼æ˜Žæ›¸ã‚’é–‹ã‘ã¾ã›ã‚“: (%d)\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA証明書 '%s' をロードã—ã¾ã—ãŸ\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "エラー：%s ã¨ã„ã†CRLファイルを開ã‘ã¾ã›ã‚“: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL ファイル '%s' をロードã—ã¾ã—ãŸ\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "エラー: GnuTLS ã¯éµã¨è¨¼æ˜Žæ›¸ã®ã‚¿ã‚¤ãƒ—ãŒåŒã˜ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ã“ã®å•é¡Œã‚’ bug-wget@gnu.org ã«å ±å‘Šã—ã¦ãã ã•ã„\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "エラー" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ã‹ã‚‰è¨¼æ˜Žæ›¸ã®æ示ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸ\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯ä¿¡ç”¨ã•ã‚Œã¾ã›ã‚“。\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã®ç™ºè¡Œè€…ãŒä¸æ˜Žã§ã™ã€‚\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã«ç½²åã—ã¦ã„ã‚‹ã®ãŒ CA ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: %s ã®è¨¼æ˜Žæ›¸ã®ç½²åã«ä½¿ã‚ã‚Œã¦ã„るアルゴリズムãŒå®‰å…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯ã¾ã æœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã›ã‚“。\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "X509 証明書ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "証明書ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "証明書を解釈中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "証明書ã¯ã¾ã æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "証明書ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "証明書ã®æ‰€æœ‰è€…ã®åå‰ã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "公開éµãŒå›ºå®šã—ãŸå…¬é–‹éµã¨ä¸€è‡´ã—ã¾ã›ã‚“!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "証明書㯠X.509 å½¢å¼ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "アドレスリストを処ç†ä¸­ã«ã‚¨ãƒ©ãƒ¼\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "ä¸æ˜Žãªãƒ›ã‚¹ãƒˆã§ã™" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "%s ã‚’DNSã«å•ã„ã‚ã‚ã›ã¦ã„ã¾ã™... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "失敗: ホスト㫠IPv4/IPv6 アドレスãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "失敗ã—ã¾ã—ãŸ: タイムアウト.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: ä¸å®Œå…¨ãªãƒªãƒ³ã‚¯ %s を解決ã§ãã¾ã›ã‚“。\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: %s ã¯ç„¡åŠ¹ãª URL ã§ã™(%s)。\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP ã«ã‚ˆã‚‹æŽ¥ç¶šè¦æ±‚ã®é€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "ヘッダãŒãªã„ã®ã§ã€HTTP/0.9 ã ã¨ä»®å®šã—ã¾ã™" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -984,11 +959,11 @@ msgstr "" "ファイル %s ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ãŠãらããƒã‚°ã§ã™ã€‚\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -996,55 +971,55 @@ msgstr "" "タイムスタンプを http å½¢å¼ã«å¤‰æ›ã§ãã¾ã›ã‚“。0 を最終変更時間ã¨ã—ã¦ä½¿ã„ã¾" "ã™ã€‚\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY データファイル %s ãŒã‚ã‚Šã¾ã›ã‚“: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "[%s]:%d ã¸ã®æŽ¥ç¶šã‚’å†åˆ©ç”¨ã—ã¾ã™ã€‚\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "%s:%d ã¸ã®æŽ¥ç¶šã‚’å†åˆ©ç”¨ã—ã¾ã™ã€‚\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "プロクシã‹ã‚‰ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s エラー %d: %s。\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "奇妙ãªã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹è¡Œã§ã™" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "プロクシã®ãƒˆãƒ³ãƒãƒªãƒ³ã‚°ã«å¤±æ•—ã—ã¾ã—ãŸ: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "ä¸æ˜Žãªèªè¨¼å½¢å¼ã§ã™ã€‚\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "é¸æŠžã•ã‚ŒãŸèªè¨¼å½¢å¼: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "%s ã«ä¿å­˜ä¸­\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1053,20 +1028,20 @@ msgstr "" "ç½²åをダウンロード中ã«:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "一時ファイルã‹ã‚‰ç½²å情報ãŒèª­ã‚ã¾ã›ã‚“。飛ã°ã—ã¾ã™ã€‚\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "一時ファイルãŒä½œã‚Œã¾ã›ã‚“。署åã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’飛ã°ã—ã¾ã™ã€‚\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "無効㪠pri 値ã§ã™ã€‚%d を用ã„ã¾ã™ã€‚\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1074,42 +1049,42 @@ msgstr "" "メタリンクリソースã«å¯¾ã—ã¦è¨±å®¹ã§ãるダイジェストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n" "無視ã—ã¾ã™ã€‚\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "エラーãŒç™ºç”Ÿã—ãŸã®ã§ SSL を無効ã«ã—ã¾ã™\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s ã«ã‚ˆã‚‹æŽ¥ç¶šè¦æ±‚ã‚’é€ä¿¡ã—ã¾ã—ãŸã€å¿œç­”ã‚’å¾…ã£ã¦ã„ã¾ã™... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "データãŒå—ä¿¡ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "ヘッダ内ã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼(%s)ã§ã™\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(説明ãªã—)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "場所: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "特定ã§ãã¾ã›ã‚“" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [続ã]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1119,7 +1094,7 @@ msgstr "" "ã™ã€‚\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1130,7 +1105,7 @@ msgstr "" "--no-if-modified-since オプションを付ã‘ã‚‹ã¨ã„ã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1140,59 +1115,59 @@ msgstr "" " ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å…¨éƒ¨å–å¾—ã—ãŠã‚ã£ã¦ã„ã¾ã™ã€‚何もã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "é•·ã•: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "無視ã—ã¾ã—ãŸ" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告: HTTPã¯ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã«å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "スパイダーモードãŒæœ‰åŠ¹ã§ã™ã€‚リモートファイルãŒå­˜åœ¨ã—ã¦ã‚‹ã‹ç¢ºèªã—ã¾ã™ã€‚\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“(%s)。\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "å¿…è¦ãªã‚¢ãƒˆãƒªãƒ“ュートãŒå—ã‘ã¨ã£ãŸãƒ˜ãƒƒãƒ€ã«ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Username/Password ã«ã‚ˆã‚‹èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "一時 WARC ファイルã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“。\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "SSL ã«ã‚ˆã‚‹æŽ¥ç¶šãŒç¢ºç«‹ã§ãã¾ã›ã‚“。\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s を削除ã§ãã¾ã›ã‚“(%s)。\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "エラー: 場所ãŒå­˜åœ¨ã—ãªã„リダイレクション(%d)ã§ã™ã€‚\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1200,23 +1175,23 @@ msgstr "" "HTTP 応答ã«ãƒ¡ã‚¿ãƒªãƒ³ã‚¯æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚HTTP GET ã§ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ã¾" "ã™ã€‚\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "メタリンクヘッダãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚メタリンクモードã«å¤‰æ›´ã—ã¾ã™ã€‚\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "リモートファイルãŒå­˜åœ¨ã—ã¦ã„ã¾ã›ã‚“ -- リンクãŒå£Šã‚Œã¦ã„ã¾ã™!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified ヘッダãŒã‚ã‚Šã¾ã›ã‚“ -- 日付を無効ã«ã—ã¾ã™ã€‚\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified ヘッダãŒç„¡åŠ¹ã§ã™ -- 日付を無視ã—ã¾ã™ã€‚\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1225,16 +1200,16 @@ msgstr "" "サーãƒå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚ˆã‚Šãƒ­ãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ã®æ–¹ãŒæ–°ã—ã„ã®ã§å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "大ãã•ãŒåˆã‚ãªã„ã®ã§(ローカル㯠%s)ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "リモートファイルã®ã»ã†ãŒæ–°ã—ã„ã®ã§ã€è»¢é€ã—ã¾ã™ã€‚\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1244,7 +1219,7 @@ msgstr "" "中。\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1253,7 +1228,7 @@ msgstr "" "ん。\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1263,18 +1238,18 @@ msgstr "" "ã™ -- å–å¾—ã—ã¾ã›ã‚“。\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" msgstr "リモートファイルãŒå­˜åœ¨ã—ã¾ã™ã€‚\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1283,7 +1258,7 @@ msgstr "" "%s (%s) - stdout ã¸å‡ºåŠ›å®Œäº† %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1292,58 +1267,58 @@ msgstr "" "%s (%s) - %s ã¸ä¿å­˜å®Œäº† [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§æŽ¥ç¶šãŒçµ‚了ã—ã¾ã—ãŸã€‚ " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s ãƒã‚¤ãƒˆã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。" -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s ãƒã‚¤ãƒˆã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠(%s)。 " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "'%s' ã¨ã„ã†ä¿è­·æ–¹å¼ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "'%s' ã¨ã„ã†ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ㌠%s を指ã—ã¦ã„ã¾ã™ãŒ, 存在ã—ã¾ã›ã‚“。\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s (%s)を読ã¿è¾¼ã‚ã¾ã›ã‚“。\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: %s 内㮠%d è¡Œã§ã‚¨ãƒ©ãƒ¼ã§ã™\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: %s 内㮠%d è¡Œã§æ–‡æ³•ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: コマンド %s (%s ã® %d行目) ã¯ä¸æ˜Žã§ã™\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1354,7 +1329,7 @@ msgstr "" "'%s'\n" "ã®å†…容を確èªã™ã‚‹ã‹ --config ã§åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1365,49 +1340,49 @@ msgstr "" "'%s'\n" "ã®å†…容を確èªã™ã‚‹ã‹ --config ã§åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: 警告: システムã¨ãƒ¦ãƒ¼ã‚¶ã® wgetrc ã®ä¸¡æ–¹ãŒ %s を指定ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: 無効㪠--execute 指定 %s ã§ã™ã€‚\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: %s ã¯ãƒ–ール値ã¨ã—ã¦ç„¡åŠ¹ã§ã™ã€‚`on' ã‹ `off' を指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: %s ã¯ç„¡åŠ¹ã§ã™ã€‚`on'ã€`off'ã€`quiet' ã®ã„ãšã‚Œã‹ã‚’指定ã—ã¦ãã ã•ã„。\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªæ•°ã§ã™ã€‚\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s ã¯ä¸€åº¦ã ã‘使ã‚れるã¹ãã‚‚ã®ã§ã™\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªãƒã‚¤ãƒˆå€¤ã§ã™ã€‚\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªæ™‚é–“é–“éš”ã§ã™ã€‚\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1416,28 +1391,28 @@ msgstr "" "use-askpass ã¯æ–‡å­—列ãŒæ¸¡ã•ã‚Œã‚‹ã‹ã€ç’°å¢ƒå¤‰æ•° WGET_ASKPASS ã‹ SSH_ASKPASS ãŒè¨­å®š" "ã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªå€¤ã§ã™ã€‚\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªãƒ˜ãƒƒãƒ€ã§ã™ã€‚\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãª WARC ヘッダã§ã™ã€‚\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: %s ã¯ç„¡åŠ¹ãªçµŒéŽè¡¨ç¤ºå½¢å¼ã§ã™ã€‚\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1447,40 +1422,40 @@ msgstr "" " unix ã‹ vms ã‹ windowsã€lowercase ã‹ uppercaseã€nocontrol ã‚„ ascii を指定" "ã—ã¦ãã ã•ã„。\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "エンコード %s ã¯ç„¡åŠ¹ã§ã™\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "%s ã‹ã‚‰ %s ã¸ã®å¤‰æ›ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "ä¸å®Œå…¨ã‹ä¸æ­£ãªãƒžãƒ«ãƒãƒã‚¤ãƒˆæ–‡å­—列ã§ã™\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "処ç†ã•ã‚Œãªã„エラー (errno %d)\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: ロケールãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode ã«å¤±æ•—ã—ã¾ã—㟠(%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "å°æ–‡å­—ã«å¤‰æ›ã§ãã¾ã›ã‚“ã§ã—ãŸ: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1489,17 +1464,17 @@ msgstr "" "\n" "%s ã«å‡ºåŠ›ã‚’リダイレクトã—ã¾ã™ã€‚\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; ログå–ã‚Šã‚’ç¦æ­¢ã—ã¾ã™ã€‚\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "使ã„æ–¹: %s [オプション]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1507,64 +1482,64 @@ msgstr "" "é•·ã„オプションã§ä¸å¯æ¬ ãªå¼•æ•°ã¯çŸ­ã„オプションã§ã‚‚ä¸å¯æ¬ ã§ã™ã€‚\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "スタートアップ:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background スタート後ã«ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã«ç§»è¡Œã™ã‚‹\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND `.wgetrc'å½¢å¼ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "ログã¨å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FILE ログを FILE ã«å‡ºåŠ›ã™ã‚‹\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FILE メッセージを FILE ã«è¿½è¨˜ã™ã‚‹\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug デãƒãƒƒã‚°æƒ…報を表示ã™ã‚‹\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32デãƒãƒƒã‚°æƒ…報を表示ã™ã‚‹\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet 何も出力ã—ãªã„\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose 冗長ãªå‡ºåŠ›ã‚’ã™ã‚‹ (デフォルト)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose 冗長ã§ã¯ãªãã™ã‚‹\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1572,7 +1547,7 @@ msgstr "" " --report-speed=TYPE 帯域幅を TYPE ã§å‡ºåŠ›ã—ã¾ã™ã€‚TYPE 㯠" "'bits' ãŒæŒ‡å®šã§ãã¾ã™ã€‚\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1580,7 +1555,7 @@ msgstr "" " -i, --input-file=FILE FILE ã®ä¸­ã«æŒ‡å®šã•ã‚ŒãŸ URL をダウンロードã™" "ã‚‹\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1588,11 +1563,11 @@ msgstr "" " --input-metalink=FILE Metalink FILE ã«æ›¸ã‹ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ダウン" "ロードã™ã‚‹\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html 入力ファイルを HTML ã¨ã—ã¦æ‰±ã†\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1601,41 +1576,41 @@ msgstr "" "ã‚’\n" " 指定ã—㟠URL ã®ç›¸å¯¾ URL ã¨ã—ã¦æ‰±ã†\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE 設定ファイルを指定ã™ã‚‹\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config 設定ファイルを読ã¿ã“ã¾ãªã„\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FILE æ‹’å¦ã•ã‚ŒãŸç†ç”±ã‚’ログ FILE ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "ダウンロード:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=NUMBER リトライ回数ã®ä¸Šé™ã‚’指定 (0 ã¯ç„¡åˆ¶é™).\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused 接続を拒å¦ã•ã‚Œã¦ã‚‚リトライã™ã‚‹\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FILE FILE ã«æ–‡æ›¸ã‚’書ãã“ã‚€\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1643,14 +1618,14 @@ msgstr "" " -nc, --no-clobber 存在ã—ã¦ã„るファイルをダウンロードã§ä¸Šæ›¸ã" "ã—ãªã„\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config 設定ファイルを読ã¿ã“ã¾ãªã„\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1658,24 +1633,24 @@ msgstr "" " -c, --continue 部分的ã«ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ç¶šãã‹ã‚‰" "始ã‚ã‚‹\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr " --start-pos=OFFSET OFFSET ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’開始ã™ã‚‹\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE 進行表示ゲージã®ç¨®é¡žã‚’ TYPE ã«æŒ‡å®šã™ã‚‹\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress ã©ã®ãƒ¢ãƒ¼ãƒ‰ã§ã‚‚進æ—ãƒãƒ¼ã‚’表示ã™ã‚‹\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1684,7 +1659,7 @@ msgstr "" " -N, --timestamping ローカルã«ã‚るファイルよりも新ã—ã„ファイル" "ã ã‘å–å¾—ã™ã‚‹\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1694,7 +1669,7 @@ msgstr "" " if-modified-since get リクエストを使ã‚ãª" "ã„\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1702,21 +1677,21 @@ msgstr "" " --no-use-server-timestamps ローカルå´ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã«\n" " サーãƒã®ã‚‚ã®ã‚’使ã‚ãªã„\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response サーãƒã®å¿œç­”を表示ã™ã‚‹\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider 何もダウンロードã—ãªã„\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDS å…¨ã¦ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECONDS 秒ã«è¨­å®šã™" "ã‚‹\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1724,7 +1699,7 @@ msgstr "" " --dns-servers=ADDRESSES åå‰ã®è§£æ±ºã«ä½¿ã†DNSサーãƒã®ãƒªã‚¹ãƒˆ (カンマ" "区切り)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1732,33 +1707,33 @@ msgstr "" " --bind-address=ADDRESS ローカルホストã®DNS resolverアドレスã¨ã—" "㦠ADDRESS (ホストåã‹ IP) を使ã†\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECS DNS å•ã„åˆã‚ã›ã®ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECS 秒ã«è¨­" "定ã™ã‚‹\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECS 接続タイムアウトを SECS 秒ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECS 読ã¿è¾¼ã¿ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã‚’ SECS 秒ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDS ダウンロード毎㫠SECONDS 秒待ã¤\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " --waitretry=SECONDS リトライ毎㫠1〜SECONDS 秒待ã¤\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1766,16 +1741,16 @@ msgstr "" " --random-wait ダウンロード毎㫠0.5*WAIT〜1.5*WAIT 秒待" "ã¤\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy プロクシを使ã‚ãªã„\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NUMBER ダウンロードã™ã‚‹ãƒã‚¤ãƒˆæ•°ã®ä¸Šé™ã‚’指定ã™ã‚‹\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1783,24 +1758,24 @@ msgstr "" " --bind-address=ADDRESS ローカルアドレスã¨ã—㦠ADDRESS (ホストå" "ã‹ IP) を使ã†\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RATE ダウンロード速度を RATE ã«åˆ¶é™ã™ã‚‹\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache DNS ã®å•ã„åˆã‚ã›çµæžœã‚’キャッシュã—ãªã„\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" " --restrict-file-names=OS OS ãŒè¨±ã—ã¦ã„るファイルåã«åˆ¶é™ã™ã‚‹\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1808,15 +1783,15 @@ msgstr "" " --ignore-case ファイルå/ディレクトリåã®æ¯”較ã§å¤§æ–‡å­—å°" "文字を無視ã™ã‚‹\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only IPv4 ã ã‘を使ã†\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only IPv6 ã ã‘を使ã†\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1825,20 +1800,20 @@ msgstr "" " --prefer-family=FAMILY 指定ã—ãŸãƒ•ã‚¡ãƒŸãƒª(IPv6, IPv4, none)ã§æœ€åˆã«" "接続ã™ã‚‹\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=USER ftp, http ã®ãƒ¦ãƒ¼ã‚¶åを指定ã™ã‚‹\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=PASS ftp, http ã®ãƒ‘スワードを指定ã™ã‚‹\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password パスワードを別途入力ã™ã‚‹\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1855,29 +1830,29 @@ msgstr "" "ãŒ\n" " 使ã‚ã‚Œã¾ã™ã€‚\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI サãƒãƒ¼ãƒˆã‚’使ã‚ãªã„\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC 指定ã—㟠ENC ã‚’ IRI ã®ãƒ­ãƒ¼ã‚«ãƒ«ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£" "ングã«ã™ã‚‹\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC 指定ã—㟠ENC をデフォルトã®ãƒªãƒ¢ãƒ¼ãƒˆã‚¨ãƒ³" "コーディングã«ã™ã‚‹\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink 上書ãã™ã‚‹å‰ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1885,7 +1860,7 @@ msgstr "" " --keep-badhash ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸€è‡´ã—ãªã‹ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚" "(ファイルåã« .badhash を追加ã—ãŸä¸Šã§)ä¿æŒã—ã¾ã™ã€‚\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1893,7 +1868,7 @@ msgstr "" " --metalink-index=NUMBER Metalink application/metalink4+xml ã® " "metaurl 番å·ã‚’ NUMBER ã«æŒ‡å®šã™ã‚‹\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1901,7 +1876,7 @@ msgstr "" " --metalink-over-http メタリンク情報を HTTP 応答ヘッダã‹ã‚‰å–å¾—ã™" "ã‚‹\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1909,7 +1884,7 @@ msgstr "" " --preferred-location メタリンクリソースã«å¯¾ã—ã¦è‰¯ã„場所をé¸æŠžã™" "ã‚‹\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1917,31 +1892,31 @@ msgstr "" " --no-xattr 拡張ファイル属性ã¸ã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ä¿å­˜ã‚’無効ã«" "ã™ã‚‹\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "ディレクトリ:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ディレクトリを作らãªã„\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories ディレクトリを強制的ã«ä½œã‚‹\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ホストåã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作らãªã„\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories プロトコルåã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作る\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX ファイルを PREFIX/ 以下ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1949,24 +1924,24 @@ msgstr "" " --cut-dirs=NUMBER リモートディレクトリåã® NUMBER 階層分を無" "視ã™ã‚‹\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP オプション:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USER http ユーザåã¨ã—㦠USER を使ã†\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=PASS http パスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache サーãƒãŒã‚­ãƒ£ãƒƒã‚·ãƒ¥ã—ãŸãƒ‡ãƒ¼ã‚¿ã‚’許å¯ã—ãªã„\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1974,24 +1949,24 @@ msgstr "" " --default-page=NAME デフォルトã®ãƒšãƒ¼ã‚¸åã‚’ NAME ã«å¤‰æ›´ã—ã¾ã™\n" " 通常㯠`index.html' ã§ã™\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" " -E, --adjust-extension HTML/CSS 文書ã¯é©åˆ‡ãªæ‹¡å¼µå­ã§ä¿å­˜ã™ã‚‹\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length `Content-Length' ヘッダを無視ã™ã‚‹\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=STRING é€ä¿¡ã™ã‚‹ãƒ˜ãƒƒãƒ€ã« STRING を追加ã™ã‚‹\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -1999,32 +1974,32 @@ msgid "" msgstr "" " --progress=TYPE 進行表示ゲージã®ç¨®é¡žã‚’ TYPE ã«æŒ‡å®šã™ã‚‹\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr " --max-redirect ページã§è¨±å¯ã™ã‚‹æœ€å¤§è»¢é€å›žæ•°\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=USER プロクシユーザåã¨ã—㦠USER を使ã†\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASS プロクシパスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr " --referer=URL Referer ã‚’ URL ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP ã®ãƒ˜ãƒƒãƒ€ã‚’ファイルã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2032,7 +2007,7 @@ msgstr "" " -U, --user-agent=AGENT User-Agent ã¨ã—㦠Wget/VERSION ã§ã¯ãªã " "AGENT を使ã†\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2040,34 +2015,34 @@ msgstr "" " --no-http-keep-alive HTTP ã® keep-alive (æŒç¶šçš„接続) 機能を使ã‚" "ãªã„\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies クッキーを使ã‚ãªã„\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=FILE クッキーを FILE ã‹ã‚‰èª­ã¿ã“ã‚€\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=FILE クッキーを FILE ã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" " --keep-session-cookies セッションã ã‘ã§ç”¨ã„るクッキーをä¿æŒã™ã‚‹\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=STRING POST メソッドを用ã„㦠STRING ã‚’é€ä¿¡ã™ã‚‹\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2075,14 +2050,14 @@ msgstr "" " --post-file=FILE POST メソッドを用ã„㦠FILE ã®ä¸­å‘³ã‚’é€ä¿¡ã™" "ã‚‹\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod \"HTTPMethod\" をヘッダã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦ä½¿" "ã„ã¾ã™\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2090,7 +2065,7 @@ msgstr "" " --body-data=STRING STRING をデータã¨ã—ã¦é€ã‚‹ã€‚--method を指定" "ã—ã¦ãã ã•ã„。\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2098,7 +2073,7 @@ msgstr "" " --body-file=FILE ファイルã®ä¸­å‘³ã‚’é€ã‚‹ã€‚--method を指定ã—ã¦" "ãã ã•ã„。\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2109,14 +2084,14 @@ msgstr "" " ローカルã®ãƒ•ã‚¡ã‚¤ãƒ«åã¨ã—ã¦ç”¨ã„ã‚‹ (実験" "çš„)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error サーãƒã‚¨ãƒ©ãƒ¼æ™‚ã«å—ä¿¡ã—ãŸå†…容を出力ã™ã‚‹\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2126,11 +2101,11 @@ msgstr "" " --auth-no-challenge サーãƒã‹ã‚‰ã®ãƒãƒ£ãƒ¬ãƒ³ã‚¸ã‚’å¾…ãŸãšã«ã€\n" " Basicèªè¨¼ã®æƒ…報をé€ä¿¡ã—ã¾ã™ã€‚\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) オプション:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2140,42 +2115,42 @@ msgstr "" " --secure-protocol=PR セキュアプロトコルをé¸æŠžã™ã‚‹ (auto, " "SSLv2, SSLv3, TLSv1, PFS)\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only 安全㪠HTTPS ã®ãƒªãƒ³ã‚¯ã ã‘ãŸã©ã‚‹\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate サーãƒè¨¼æ˜Žæ›¸ã‚’検証ã—ãªã„\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=FILE クライアント証明書ã¨ã—㦠FILE を使ã†\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE クライアント証明書ã®ç¨®é¡žã‚’ TYPE (PEM, " "DER) ã«è¨­å®šã™ã‚‹\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FILE 秘密éµã¨ã—㦠FILE を使ã†\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYPE 秘密éµã®ç¨®é¡žã‚’ TYPE (PEM, DER) ã«è¨­å®šã™" "ã‚‹\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FILE CA 証明書ã¨ã—㦠FILE を使ã†\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2183,11 +2158,11 @@ msgstr "" " --ca-directory=DIR CA ã®ãƒãƒƒã‚·ãƒ¥ãƒªã‚¹ãƒˆãŒä¿æŒã•ã‚Œã¦ã„るディレ" "クトリを指定ã™ã‚‹\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FILE CRL ファイルを指定ã™ã‚‹\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2202,7 +2177,7 @@ msgstr "" "ン区切り)を指定ã—ã¦ã€\n" " 相手をèªè¨¼ã—ã¾ã™ã€‚\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2210,21 +2185,21 @@ msgstr "" " --random-file=FILE SSL PRNG ã®åˆæœŸåŒ–データã«ä½¿ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指" "定ã™ã‚‹\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=FILE EGD ソケットã¨ã—㦠FILE を使ã†\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS オプション:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS を使ã‚ãªã„\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2232,11 +2207,11 @@ msgstr "" " --hsts-file HSTS データベースã®ãƒ‘ス (デフォルトを上書" "ã)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP オプション:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2244,35 +2219,35 @@ msgstr "" " --ftp-stmlf ftp ã®å…¨ã¦ã®ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã§ Stream_LF " "フォーマットを用ã„ã¾ã™ã€‚\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USER ftp ユーザã¨ã—㦠USER を使ã†\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=PASS ftp パスワードã¨ã—㦠PASS を使ã†\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing `.listing' ファイルを削除ã—ãªã„\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob FTP ファイルåã®ã‚°ãƒ­ãƒ–を無効ã«ã™ã‚‹\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp \"passive\" 転é€ãƒ¢ãƒ¼ãƒ‰ã‚’使ã‚ãªã„\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions リモートã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘ーミッションをä¿å­˜ã™" "ã‚‹\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2280,11 +2255,11 @@ msgstr "" " --retr-symlinks å†å¸°å–得中ã«ã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã§ãƒªãƒ³ã‚¯ã•" "ã‚ŒãŸå…ˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—ã™ã‚‹\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS オプション:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2292,7 +2267,7 @@ msgstr "" " --ftps-implicit implicit FTPS を使ㆠ(デフォルトãƒãƒ¼ãƒˆ" "㯠990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2302,7 +2277,7 @@ msgstr "" "ã‚’\n" " データ接続ã§å†é–‹ã™ã‚‹\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2310,7 +2285,7 @@ msgstr "" " --ftps-clear-data-connection 制御ãƒãƒ£ãƒãƒ«ã ã‘æš—å·åŒ–ã™ã‚‹(データã¯å¹³" "æ–‡ã«ãªã‚‹)\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2318,11 +2293,11 @@ msgstr "" " --ftps-fallback-to-ftp サーãƒãŒ FTPS ã«å¯¾å¿œã—ã¦ã„ãªã„å ´åˆã¯ " "FTP ã«ã™ã‚‹\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC オプション:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2330,24 +2305,24 @@ msgstr "" " --warc-file=FILENAME リクエスト/レスãƒãƒ³ã‚¹ãƒ‡ãƒ¼ã‚¿ã‚’ .warc.gz " "ファイルã«ä¿å­˜ã™ã‚‹\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRING warcinfo record ã« STRING を追加ã™ã‚‹\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NUMBER WARC ファイルã®ã‚µã‚¤ã‚ºã®æœ€å¤§å€¤ã‚’ NUMBER ã«" "設定ã™ã‚‹\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX インデックスファイルを書ã\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2355,23 +2330,23 @@ msgstr "" " --warc-dedup=FILENAME 指定ã—㟠CDX ファイルã«è¼‰ã£ã¦ã„ã‚‹ record " "ã¯ä¿å­˜ã—ãªã„\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression WARC ファイルを GZIP ã§åœ§ç¸®ã—ãªã„\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests SHA1 ダイジェストを計算ã—ãªã„\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log WARC record ã«ãƒ­ã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å­˜ã—ãªã„\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2380,15 +2355,15 @@ msgstr "" " --warc-tempdir=DIRECTORY WARC 書込時ã®ä¸€æ™‚ファイルを置ãディレクト" "リを指定ã™ã‚‹\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚’è¡Œã†\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2396,7 +2371,7 @@ msgstr "" " -l, --level=NUMBER å†å¸°æ™‚ã®éšŽå±¤ã®æœ€å¤§ã®æ·±ã•ã‚’ NUMBER ã«è¨­å®šã™" "ã‚‹ (0 ã§ç„¡åˆ¶é™)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2404,7 +2379,7 @@ msgstr "" " --delete-after ダウンロード終了後ã€ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤" "ルを削除ã™ã‚‹\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2413,7 +2388,7 @@ msgstr "" " -k, --convert-links HTML ã‚„ CSS 中ã®ãƒªãƒ³ã‚¯ã‚’ローカルを指ã™ã‚ˆã†" "ã«å¤‰æ›´ã™ã‚‹\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2421,7 +2396,7 @@ msgstr "" " --convert-file-only URLã®ãƒ•ã‚¡ã‚¤ãƒ«å部分ã ã‘変æ›ã™ã‚‹ (ã„ã‚ゆる" "basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2429,7 +2404,7 @@ msgstr "" " --backups=N ファイルã«æ›¸ãã“む時㫠N ファイルã®ãƒãƒƒã‚¯" "アップをローテーションã•ã›ã‚‹\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2437,7 +2412,7 @@ msgstr "" " -K, --backup-converted リンク変æ›å‰ã®ãƒ•ã‚¡ã‚¤ãƒ« X ã‚’ X_orig ã¨ã—ã¦" "ä¿å­˜ã™ã‚‹\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2445,14 +2420,14 @@ msgstr "" " -K, --backup-converted リンク変æ›å‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ .orig ã¨ã—ã¦ä¿å­˜" "ã™ã‚‹\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" " -m, --mirror -N -r -l 0 --no-remove-listing ã®çœç•¥å½¢\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2460,18 +2435,18 @@ msgstr "" " -p, --page-requisites HTML を表示ã™ã‚‹ã®ã«å¿…è¦ãªå…¨ã¦ã®ç”»åƒç­‰ã‚‚å–" "å¾—ã™ã‚‹\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" " --strict-comments HTML 中ã®ã‚³ãƒ¡ãƒ³ãƒˆã®å‡¦ç†ã‚’厳密ã«ã™ã‚‹\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "å†å¸°ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰æ™‚ã®ãƒ•ã‚£ãƒ«ã‚¿:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2479,7 +2454,7 @@ msgstr "" " -A, --accept=LIST ダウンロードã™ã‚‹æ‹¡å¼µå­ã‚’コンマ区切りã§æŒ‡å®š" "ã™ã‚‹\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2487,43 +2462,43 @@ msgstr "" " -R, --reject=LIST ダウンロードã—ãªã„æ‹¡å¼µå­ã‚’コンマ区切りã§æŒ‡" "定ã™ã‚‹\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX 許容ã™ã‚‹ URL ã®æ­£è¦è¡¨ç¾ã‚’指定ã™ã‚‹\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX æ‹’å¦ã™ã‚‹ URL ã®æ­£è¦è¡¨ç¾ã‚’指定ã™ã‚‹\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE æ­£è¦è¡¨ç¾ã®ã‚¿ã‚¤ãƒ— (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE æ­£è¦è¡¨ç¾ã®ã‚¿ã‚¤ãƒ— (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST ダウンロードã™ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’コンマ区切りã§æŒ‡" "定ã™ã‚‹\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST ダウンロードã—ãªã„ドメインをコンマ区切りã§" "指定ã™ã‚‹\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp HTML 文書中㮠FTP リンクもå–得対象ã«ã™ã‚‹\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2531,7 +2506,7 @@ msgstr "" " --follow-tags=LIST å–得対象ã«ã™ã‚‹ã‚¿ã‚°åをコンマ区切りã§æŒ‡å®šã™" "ã‚‹\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2539,22 +2514,22 @@ msgstr "" " --ignore-tags=LIST å–得対象ã«ã—ãªã„ã‚¿ã‚°åをコンマ区切りã§æŒ‡å®š" "ã™ã‚‹\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts å†å¸°ä¸­ã«åˆ¥ã®ãƒ›ã‚¹ãƒˆã‚‚ダウンロード対象ã«ã™" "ã‚‹\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative 相対リンクã ã‘å–得対象ã«ã™ã‚‹\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LIST å–得対象ã«ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’指定ã™ã‚‹\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2563,86 +2538,86 @@ msgstr "" " --trust-server-names ファイルåã¨ã—ã¦ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆå…ˆã®URLã®æœ€å¾Œ" "ã®éƒ¨åˆ†ã‚’使ã†\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LIST å–得対象ã«ã—ãªã„ディレクトリを指定ã™ã‚‹\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent 親ディレクトリをå–得対象ã«ã—ãªã„\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "ãƒã‚°å ±å‘Šã‚„æ案ã¯ã¸\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, éžå¯¾è©±çš„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è»¢é€ã‚½ãƒ•ãƒˆ\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "ユーザ %s ã®ãƒ‘スワード: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "パスワード: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "パイプãŒä½œæˆã§ãã¾ã›ã‚“\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "èªè¨¼æƒ…å ±å–得用ã®ãƒ—ログラム(use-askpass)ã‚’èµ·å‹•ã™ã‚‹ãŸã‚ã®åˆæœŸåŒ–ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—" "ã¾ã—ãŸ: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "èªè¨¼æƒ…å ±å–得用ã®ãƒ—ログラム(use-askpass)ã‚’èµ·å‹•ã™ã‚‹ãŸã‚ã®è¨­å®šã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾" "ã—ãŸ: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "コマンド \"%s %s\" ã®å¿œç­”ã®èª­ã¿è¾¼ã¿ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "'%s%s' ã®ãƒ¦ãƒ¼ã‚¶å: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "%s%s@%s ã®ãƒ‘スワード: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "ロケール: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "コンパイル: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "リンク: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2651,29 +2626,29 @@ msgstr "" "GNU Wget %s built on %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2687,7 +2662,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2695,38 +2670,38 @@ msgstr "" "\n" "Hrvoje Niksic ã«ã‚ˆã£ã¦æ›¸ã‹ã‚Œã¾ã—ãŸã€‚\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "ãƒã‚°å ±å‘Šã‚„質å•ã¯ã¸\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "メモリ確ä¿ã§ãã¾ã›ã‚“\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "エラーã®ãŸã‚終了ã—ã¾ã™ï¼š%s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "詳ã—ã„オプション㯠`%s --help' を実行ã—ã¦ãã ã•ã„。\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: `-n%c' ã¯ä¸æ­£ãªã‚ªãƒ—ション指定ã§ã™\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "デãƒãƒƒã‚°ã‚µãƒãƒ¼ãƒˆãŒã‚³ãƒ³ãƒ‘イル時ã«æœ‰åŠ¹ã«ã•ã‚Œã¦ã„ã¾ã›ã‚“。--debug フラグを無視ã—" "ã¾ã™ã€‚\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2735,7 +2710,7 @@ msgstr "" "--no-clobber 㨠--convert-links ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€--convert-links ã ã‘ãŒæœ‰" "効ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2744,24 +2719,24 @@ msgstr "" "--no-clobber 㨠--convert-file-only ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸãŒã€--convert-file-only " "ã ã‘ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" "出力を詳細ã«ã™ã‚‹ã‚ªãƒ—ションã¨å‡ºåŠ›ã‚’抑制ã™ã‚‹ã‚ªãƒ—ションをåŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›" "ã‚“\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "-Nã¨-ncã¨ã‚’åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“。\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "--inet4-only 㨠--inet6-only を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2773,7 +2748,7 @@ msgstr "" "ニュアルをå‚ç…§ã—ã¦ãã ã•ã„。\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2783,7 +2758,7 @@ msgstr "" "å…¨ã¦æŒ‡å®šã•ã‚ŒãŸä¸€ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å…¥ã‚‹ã“ã¨ã‚’æ„味ã—ã¾ã™ã€‚\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2793,12 +2768,7 @@ msgstr "" "詳ã—ãã¯ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "ファイル `%s' ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2806,7 +2776,7 @@ msgstr "" "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --no-clobber ã¯ä½¿ãˆãªã„ã®ã§ã€--no-clobber を無効ã«ã—ã¾" "ã™ã€‚\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2814,12 +2784,12 @@ msgstr "" "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ãŒä½¿ãˆãªã„ã®ã§ã€ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—を無効ã«ã—ã¾" "ã™ã€‚\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --spider ã¯ä½¿ãˆã¾ã›ã‚“。\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2828,7 +2798,7 @@ msgstr "" "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --continue ã‚„ --start-pos ã¯ä½¿ãˆãªã„ã®ã§ã€ãれらを無効" "ã«ã—ã¾ã™ã€‚\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2836,7 +2806,7 @@ msgstr "" "ダイジェストãŒç„¡åŠ¹ã§ã™ã€‚WARC ã®é‡è¤‡æŽ’除機能ã§é‡è¤‡ record を見ã¤ã‘られã¾ã›" "ん。\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2845,12 +2815,12 @@ msgstr "" "WARC ã§å‡ºåŠ›ã™ã‚‹å ´åˆã¯ --continue ã‚„ --start-pos ã¯ä½¿ãˆãªã„ã®ã§ã€ãれらを無効" "ã«ã—ã¾ã™ã€‚\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "--ask-password 㨠--password を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2859,17 +2829,17 @@ msgstr "" "--start-pos 㨠--continue ã®ä¸¡æ–¹ã‚’指定ã™ã‚‹ã“ã¨ã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“。--continue ã¯" "無効ã«ãªã‚Šã¾ã™ã€‚\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URLãŒã‚ã‚Šã¾ã›ã‚“\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "--post-data 㨠--post-file を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2878,7 +2848,7 @@ msgstr "" "--post-data 㨠--post-file 㯠--method ã¨ä¸€ç·’ã«ã¯ä½¿ãˆã¾ã›ã‚“。--method を使ã†" "å ´åˆã¯ã€ãƒ‡ãƒ¼ã‚¿ã‚’ --body-data ã‹ --body-file ã‹ã‚‰ä¸Žãˆã¦ãã ã•ã„\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2887,23 +2857,23 @@ msgstr "" "--body-data ã‚„ --body-file を使ã†å ´åˆã¯ã€--method ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚’指定ã—ã¦ãã ã•" "ã„。\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "--body-data 㨠--body-file を両方指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ IRI をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "-k ã‚„ -r ã¯æ™®é€šã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å‡ºåŠ›ã™ã‚‹æ™‚ã ã‘ -O ã¨ä¸€ç·’ã«ä½¿ãˆã¾ã™ã€‚\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2912,42 +2882,42 @@ msgstr "" "--convert-links ã‚„ --convert-file-only ã¯æ™®é€šã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å‡ºåŠ›ã™ã‚‹æ™‚ã ã‘使ãˆã¾" "ã™ã€‚\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "libcares ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "c-ares ãƒãƒ£ãƒãƒ«ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "IP アドレス '%s' ã‚’ç†è§£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "'%s' ã¨ã„ã†DNSサーãƒã‚’設定ã§ãã¾ã›ã‚“: (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "%s ã«ã¯URLãŒã‚ã‚Šã¾ã›ã‚“。\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "メタリンクファイル %s ã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "%s ã‹ã‚‰å…¨ã¦ã«ãƒªã‚½ãƒ¼ã‚¹ã¯ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2958,7 +2928,7 @@ msgstr "" "経éŽæ™‚é–“: %s\n" "ダウンロード完了: %d ファイルã€%s ãƒã‚¤ãƒˆã‚’ %s ã§å–å¾— (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "容é‡åˆ¶é™(%s ãƒã‚¤ãƒˆ)を超éŽã—ã¾ã™!\n" @@ -3114,120 +3084,120 @@ msgstr "ファイル %s ã‚’å–å¾—ã—ã¾ã—ãŸãŒã€ç½²åãŒç„¡åŠ¹ã§ã™ã€‚\n" msgid "Renaming %s to %s.\n" msgstr "%s ã‚’ %s ã«ãƒªãƒãƒ¼ãƒ ã—ã¾ã™ã€‚\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ç¶™ç¶šã—ã¾ã™ã€‚\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ç¶™ç¶šã—ã¾ã™ã€pid㯠%lu。\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "出力を %s ã«æ›¸ãè¾¼ã¿ã¾ã™ã€‚\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() ãŒå¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() ãŒå¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: 使用å¯èƒ½ãªã‚½ã‚±ãƒƒãƒˆãƒ‰ãƒ©ã‚¤ãƒã‚’見ã¤ã‘られã¾ã›ã‚“。\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "ioctl() ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ソケットãŒãƒ–ロッキングã™ã‚‹ã‚ˆã†ã«è¨­å®šã§ãã¾ã›ã‚“ã§ã—" "ãŸã€‚\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: 警告: 区切り記å·(token) %s ã¯ã™ã¹ã¦ã®ãƒžã‚·ãƒ³åã®å‰ã«ç¾ã‚ã‚Œã¾ã™\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: \"%s\" ã¯ä¸æ˜ŽãªåŒºåˆ‡ã‚Šè¨˜å·(token)ã§ã™\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "使ã„æ–¹: %s NETRC [ホストå]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %sã®æƒ…報をå–å¾—ã§ãã¾ã›ã‚“: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "警告: å¼±ã„乱数ã®ç¨®ã‚’使用ã—ã¦ã„ã¾ã™\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "PRNGã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚--random-file ã®ä½¿ç”¨ã‚’検討ã—ã¦ãã ã•ã„。\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.1 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã™ãŽã¦ TLSv1.2 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: 実装ã•ã‚Œã¦ã„ãªã„ 'secure-protocol' オプション値 %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: %s ã®è¨¼æ˜Žæ›¸(発行者: %s)ã®æ¤œè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " 発行者ã®æ¨©é™ã‚’検証ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " 自己署å証明書ã§ã™ã€‚\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " 発行ã•ã‚ŒãŸè¨¼æ˜Žæ›¸ã¯ã¾ã æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " 発行ã•ã‚ŒãŸè¨¼æ˜Žæ›¸ã¯å¤±åŠ¹ã—ã¦ã„ã¾ã™ã€‚\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "%s: 証明書ã«è¨˜è¼‰ã•ã‚Œã¦ã„る別åã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr " %s: 証明書ã«è¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹åå‰ %s ã¨ãƒ›ã‚¹ãƒˆå %s ãŒä¸€è‡´ã—ã¾ã›ã‚“\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3238,14 +3208,14 @@ msgstr "" " 接続先ã®ã‚µãƒ¼ãƒãŒãªã‚Šã™ã¾ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" " ã¤ã¾ã‚Šã€æœ¬ç‰©ã® %s ã§ã¯ãªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "%s ã«å®‰å…¨ã®ç¢ºèªã‚’ã—ãªã„ã§æŽ¥ç¶šã™ã‚‹ã«ã¯ã€`--no-check-certificate' を使ã£ã¦ãã " "ã•ã„。\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3254,28 +3224,28 @@ msgstr "" "\n" "%*s[ %sK ã¨ã°ã—ã¾ã™ ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "%s ã¯ç„¡åŠ¹ãªãƒ‰ãƒƒãƒˆè¡¨ç¤ºå½¢å¼ãªã®ã§å¤‰æ›´ã—ã¾ã›ã‚“。\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " 残り%s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " 時間 " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "リアルタイムクロックã®å‘¨æ³¢æ•°ã‚’å–å¾—ã§ãã¾ã›ã‚“: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "æ‹’å¦ã™ã¹ããªã®ã§ã€%s を削除ã—ã¾ã—ãŸã€‚\n" @@ -3289,22 +3259,22 @@ msgstr "%s ã‚’é–‹ã‘ã¾ã›ã‚“: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txtを読ã¿è¾¼ã‚“ã§ã„ã¾ã™ã€ã‚¨ãƒ©ãƒ¼ã¯ç„¡è¦–ã—ã¦ãã ã•ã„。\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "proxy URL %s を解釈中ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "proxy URL %s ã«é–“é•ã„ãŒã‚ã‚Šã¾ã™: HTTPã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "リダイレクション回数㌠%d を越ãˆã¾ã—ãŸã€‚\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3312,7 +3282,7 @@ msgstr "" "中止ã—ã¾ã—ãŸã€‚\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3320,126 +3290,126 @@ msgstr "" "å†è©¦è¡Œã—ã¦ã„ã¾ã™ã€‚\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "エラーãªã—" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "%s ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„スキームã§ã™" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "スキームãŒã‚ã‚Šã¾ã›ã‚“" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "ホストåãŒä¸æ­£ã§ã™" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "ãƒãƒ¼ãƒˆç•ªå·ãŒä¸æ­£ã§ã™" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "ユーザåãŒä¸æ­£ã§ã™" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "IPv6 アドレスã®è¨˜è¿°ãŒçµ‚了ã—ã¦ã„ã¾ã›ã‚“" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 アドレスã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "IPv6 アドレスãŒä¸æ­£ã§ã™" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚ˆã†ã‚³ãƒ³ãƒ‘イルã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "ä¸å®Œå…¨ã‹ä¸æ­£ãªãƒžãƒ«ãƒãƒã‚¤ãƒˆæ–‡å­—列ã§ã™\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: メモリã®ç¢ºä¿ã«å¤±æ•—ã—ã¾ã—ãŸ; メモリãŒã„ã£ã±ã„ã§ã™\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: %ld ãƒã‚¤ãƒˆã®ç¢ºä¿ã«å¤±æ•—ã—ã¾ã—ãŸ; メモリãŒã„ã£ã±ã„ã§ã™\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: テキストãƒãƒƒãƒ•ã‚¡ (%d bytes) ã¯å¤§ãã™ãŽã‚‹ã®ã§ã€ä¸­æ­¢ã—ã¾ã™ã€‚\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ç¶™ç¶šã—ã¾ã™ã€pid㯠%d。\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "シンボリックリンク %s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "libcares ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "IP アドレス '%s' ã‚’ç†è§£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "%s ã®ãƒ‘ーミッションãŒè¨­å®šã§ãã¾ã›ã‚“。\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "%s ã¯ç„¡åŠ¹ãªæ­£è¦è¡¨ç¾ã§ã™, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "%s をマッãƒä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3523,6 +3493,24 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "CDX ファイルã«ä¸€è‡´ã‚’発見ã—ã¾ã—ãŸã€‚revisit レコードを WARC ã«è¨˜éŒ²ã—ã¾ã™ã€‚\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã›ã‚“\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: '--%s' ã¯èªè­˜ã§ããªã„オプションã§ã™\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å–ã‚Šã¾ã›ã‚“\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å¿…è¦ã¨ã—ã¾ã™\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "ファイル `%s' ã¯ã™ã§ã«å­˜åœ¨ã™ã‚‹ã®ã§ã€å–å¾—ã—ã¾ã›ã‚“。\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/lt.gmo b/po/lt.gmo index 44757e8..3068f76 100644 Binary files a/po/lt.gmo and b/po/lt.gmo differ diff --git a/po/lt.po b/po/lt.po index 95da31e..f8bb9cb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: wget-1.11.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2009-01-29 00:21+0200\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Nežinoma klaida" @@ -29,7 +29,7 @@ msgstr "Nežinoma klaida" msgid "Address family for hostname not supported" msgstr "IPv6 adresai nepalaikomi" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Laikinas vardų paieÅ¡kos sutrikimas" @@ -100,70 +100,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Nežinoma klaida" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pasirinkimas „%s“ dviprasmiÅ¡kas\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: pasirinkimas „%s“ dviprasmiÅ¡kas\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: parametras „--%s“ neleidžia argumento\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neatpažintas parametras „%c%s“\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: parametras „%c%s“ neleidžia argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: parametrui „%s“ reikia argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neatpažintas parametras „--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neatpažintas parametras „%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: negalimas parametras – %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: parinkÄiai bÅ«tinas argumentas – %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: parametras „-W %s“ dviprasmis\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: parametras „-W %s“ neleidžia argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: parametrui „%s“ reikia argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -183,13 +158,13 @@ msgstr "%s: parametrui „%s“ reikia argumento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -264,28 +239,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -304,51 +279,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, fuzzy, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: nepavyko rasti bind adreso „%s“; iÅ¡jungiamas bind.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Jungiamasi prie %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Jungiamasi prie %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "Jungiamasi prie %s:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "prisijungta.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "nepavyko: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, fuzzy, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nepavyko rasti adreso „%s“\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,174 +357,174 @@ msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Nepavyko padaryti atsarginÄ—s %s kopijos %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "SintaksÄ—s klaida Set-Cookie: %s pozicijoje %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Slapukas iÅ¡ %s pabandÄ— nustatyti domenÄ… į %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Nepavyko atverti slapukų failo „%s“: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Klaida raÅ¡ant į „%s“: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Klaida uždarant „%s“: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Nesuderinamas sÄ…raÅ¡o tipas, bandomas Unix tipo sÄ…rašų doroklis.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s turinys adresu %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "laikas nežinomas " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Failas " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Aplankas " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Saitas " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "NeaiÅ¡ku " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s baitų)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Dydis: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", liko %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", liko %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (neautoritatyvus)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Prisijungiama kaip %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Klaida paslaugų stotyje, uždaromas valdymo prisijungimas.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Klaida paslaugų stoties pasisveikinime.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Ä®raÅ¡ymas nepavyko, uždaromas valdymo prisijungimas.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Paslaugų stotis atsisako priimti prisijungimÄ….\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "NekorektiÅ¡kas prisijungimas.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Prisijungta!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Paslaugų stoties klaida, nepavyksta nustatyti sistemos tipo.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "atlikta. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "atlikta.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Nežinomas tipas „%c“, uždaromas valdymo prisijungimas.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "atlikta. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nereikalingas.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -557,7 +532,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -566,38 +541,38 @@ msgstr "" "Nerastas aplankas „%s“.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nereikalingas.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nepavyksta paleisti PASV persiuntimo.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Nesuprantamas PASV atsakas.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "nepavyko prisijungti prie %s prievado %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Susiejimo klaida (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "NekorektiÅ¡kas PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,21 +580,21 @@ msgstr "" "\n" "Nepavyko REST, pradedama iÅ¡ naujo.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, fuzzy, c-format msgid "File %s exists.\n" msgstr "" "NutolÄ™s failas egzistuoja.\n" "\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "Nerastas failas „%s“.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -628,7 +603,7 @@ msgstr "" "Nerastas failas „%s“.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -637,40 +612,40 @@ msgstr "" "NÄ—ra tokio failo ar aplanko „%s“.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s staiga susikÅ«rÄ—.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, uždaromas valdymo prisijungimas.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Duomenų prisijungimas: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Valdymo prisijungimas uždarytas.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Duomenų siuntimas nutrauktas.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(bandymas:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -679,7 +654,7 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -688,33 +663,33 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡ytas [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Å alinamas %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "Naudojamas „%s“ kaip laikinas sÄ…raÅ¡o failas.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "PaÅ¡alintas „%s“.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Apdorojimo gylis %d virÅ¡ijo didžiausiÄ… gylį %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "NutolÄ™s failas nÄ—ra naujesnis už vietinį „%s“ – nesiunÄiama.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -723,7 +698,7 @@ msgstr "" "NutolÄ™s failas yra naujesnis už vietinį „%s“ – siunÄiama.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -732,11 +707,11 @@ msgstr "" "Failų dydžiai nesutampa (vietinis %s) – siunÄiama.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "NekorektiÅ¡kas saito vardas, praleidžiamas.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -745,243 +720,243 @@ msgstr "" "Saitas %s -> %s jau yra\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Kuriama simbolinÄ— nuoroda %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "SimbolinÄ—s nuorodos nepalaikomos, praleidžiama nuoroda „%s“.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "Praleidžiamas aplankas „%s“.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: nežinomas/nesuderinamas failo tipas.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: pažeista laiko žymÄ—.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Aplankai nebus siunÄiami, nes gylis nurodytas %d (maksimalus %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Nesileidžiama į „%s“, nes jis nufiltruotas/neįtrauktas.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Atmetamas „%s“.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Klaida taikant %s su %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "NÄ—ra „%s“ atitikmenų.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML formato turinys įraÅ¡ytas į „%s“ [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML formato turinys įraÅ¡ytas į „%s“.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" "Siųskite praneÅ¡imus apie klaidas ir pasiÅ«lymus adresu .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "KLAIDA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "Ä®SPÄ–JIMAS" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, fuzzy, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, fuzzy, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 #, fuzzy msgid "No certificate found\n" msgstr "%s: %s nepateikÄ— sertifikato.\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 #, fuzzy msgid "The certificate has not yet been activated\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 #, fuzzy msgid "The certificate has expired\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, fuzzy, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "%s: sertifikato vardas „%s“ neatitinka kompiuterio vardo „%s“.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Neatpažintas kompiuterio vardas" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "IeÅ¡koma %s..." -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "nepavyko: NÄ—ra IPv4/IPv6 adresų kompiuteriui.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "nepavyko: per ilgai neatsako.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: nepavyksta atsekti saito %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Klaida raÅ¡ant HTTP užklausÄ…: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "NÄ—ra antraÅ¡Äių, bandoma kaip HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" @@ -990,133 +965,133 @@ msgstr "" "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "NÄ—ra POST duomenų failo „%s“: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Naudojamas esamas prisijungimas prie %s:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Naudojamas esamas prisijungimas prie %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Klaida skaitant tarpinÄ—s stoties atsakÄ…: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s KLAIDA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Netinkama bÅ«senos eilutÄ—" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "TarpinÄ—s stoties tuneliavimas nesÄ—kmingas: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Nesuprantamas autentifikavimo bÅ«das.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Nesuprantamas autentifikavimo bÅ«das.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, fuzzy, c-format msgid "Saving to: %s\n" msgstr "RaÅ¡oma į: „%s“\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "DÄ—l įvykusių klaidų iÅ¡jungiamas SSL.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s užklausa iÅ¡siųsta, laukiama atsakymo..." -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Negauta duomenų.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "AntraÅ¡Äių skaitymo klaida (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(be apraÅ¡ymo)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Vieta: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nenurodyta" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [sekama]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1124,7 +1099,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1134,81 +1109,81 @@ msgstr "" " Failas jau atsiųstas iki galo; užduoÄių nebeliko.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Dydis: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignoruojamas" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "PerspÄ—jimas: Å¡ablonai nesuderinami su HTTP protokolu.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "PaieÅ¡kos veiksena įjungta. Tikrinama, ar nutolÄ™s failas egzistuoja.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Nepavyko užmegzti SSL prisijungimo.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nepavyksta raÅ¡yti į „%s“ (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "KLAIDA: Nukreipimas (%d) niekur neveda.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "NutolÄ™s failas neegzistuoja – klaidinga nuoroda!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "TrÅ«ksta paskutinio keitimo antraÅ¡tÄ—s – laiko žymÄ—s iÅ¡jungtos.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Paskutinio keitimo antraÅ¡tÄ— netaisyklinga – laiko žymÄ—s iÅ¡jungtos.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1217,16 +1192,16 @@ msgstr "" "Serverio filas ne naujesnis negu vietinis failas „%s“ – nesiunÄiama.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Nesutampa failų dydžiai (vietinis failas %s) – siunÄiama.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "NutolÄ™s failas yra naujesnis, siunÄiama.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1236,7 +1211,7 @@ msgstr "" "siunÄiama.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1244,7 +1219,7 @@ msgstr "" "NutolÄ™s failas egzistuoja, bet jame nÄ—ra nuorodų – nesiunÄiama.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1254,7 +1229,7 @@ msgstr "" "bet rekursija iÅ¡junga – nesiunÄiama.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1262,12 +1237,12 @@ msgstr "" "NutolÄ™s failas egzistuoja.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1276,7 +1251,7 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1285,58 +1260,58 @@ msgstr "" "%s (%s) - „%s“ įraÅ¡yta [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Prisijungimas užvertas ties %s baitu. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Skaitymo klaida ties %s (%s) baitu." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Skaitymo klaida ties %s/%s (%s) baitu. " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepalaikoma schema" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC veda į %s, kuri neegzistuoja.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nepavyksta nuskaityti %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Klaida %s eilutÄ—je %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: SintaksÄ—s klaida %s eilutÄ—je %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Faile %s nežinoma komanda „%s“ eilutÄ—je %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1344,7 +1319,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1352,76 +1327,76 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: PerspÄ—jimas: Tiek naudotojo, tiek sistemos wgetrc failas rodo į „%s“.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: NekorektiÅ¡ka --execute komanda „%s“\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: NekorektiÅ¡ka loginÄ— reikÅ¡mÄ— „%s“; naudokite „on“ arba „off“.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: NekorektiÅ¡ka loginÄ— reikÅ¡mÄ— „%s“; naudokite „on“ arba „off“.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: NekorektiÅ¡kas skaitmuo „%s“.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: NekorektiÅ¡ka baito reikÅ¡mÄ— „%s“\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: NekorektiÅ¡kas laiko periodas „%s“\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: NekorektiÅ¡ka reikÅ¡mÄ— „%s“.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: NekorektiÅ¡ka antraÅ¡tÄ— „%s“.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: NekorektiÅ¡ka antraÅ¡tÄ— „%s“.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: NekorektiÅ¡kas pažangos tipas „%s“.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1430,40 +1405,40 @@ msgstr "" "%s: %s: Netaisyklingas apribojimas „%s“, naudokite [unix|windows],[lowercase|" "uppercase],[nocontrol].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "nepavyko prisijungti prie %s prievado %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1472,17 +1447,17 @@ msgstr "" "\n" "gauta %s, iÅ¡vedimas nukreipiamas į „%s“.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; žurnalas iÅ¡jungiamas.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Naudojimas: %s [PARINKTIS]... [ADRESAS]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1491,69 +1466,69 @@ msgstr "" "argumentams.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Pradžia:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version parodyti Wget versijÄ… ir iÅ¡eiti.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help iÅ¡spausdinti Å¡iÄ… informacijÄ….\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background veikti fone.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMMAND įvykdyti „.wgetrc“ tipo komandÄ….\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Žurnalai ir įvedimo failas:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FAILAS iÅ¡vesti praneÅ¡imus į FAILÄ„.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FAILAS pridÄ—ti praneÅ¡imus FAILO pabaigoje.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug iÅ¡vesti daug derinimo informacijos.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug iÅ¡spausdinti Watt-32 derinimo informacijÄ….\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tyli veiksena (be iÅ¡vesties).\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose informuoti iÅ¡samiai (numatytoji reikÅ¡mÄ—).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1562,33 +1537,33 @@ msgstr "" " -nv, --no-verbose sumažinti informatyvumÄ… (bet neiÅ¡jungti " "praneÅ¡imų).\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=FAILAS parsiųsti URL adresus, rastus FAILE.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr " -i, --input-file=FAILAS parsiųsti URL adresus, rastus FAILE.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html suprasti skaityti nurodytÄ… failÄ… kaip HTML tipo failÄ….\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1597,26 +1572,26 @@ msgstr "" " -N, --timestamping nesiųsti failų, nebent naujesni už " "vietinius.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Parsiuntimas:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1625,7 +1600,7 @@ msgstr "" " -t, --tries=SKAIÄŒIUS nustatyti bandymų parsiųsti SKAIÄŒIŲ (0 – " "neriboti).\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1633,12 +1608,12 @@ msgstr "" " --retry-connrefused bandyti iÅ¡ naujo net jei prisijungimas " "atmetamas.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FAILAS raÅ¡yti dokumentus į FAILÄ„.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1648,33 +1623,33 @@ msgstr "" "perraÅ¡yti\n" " esamus failus.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies nenaudoti slapukų.\n" +msgstr " -np, --no-parent neiti aukÅ¡tyn į tÄ—vinį aplankÄ….\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue tÄ™sti dalinai parsiųstÄ… failÄ….\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " @@ -1682,7 +1657,7 @@ msgid "" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1692,42 +1667,42 @@ msgstr "" " -N, --timestamping nesiųsti failų, nebent naujesni už " "vietinius.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response iÅ¡vesti serverio atsakymÄ….\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider nieko nesiųsti.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEK nustatyti visus laukimo laikus į SEK.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1736,31 +1711,31 @@ msgstr "" " --bind-address=ADRESAS susieti su ADRESU (kompiuterio vardu ar\n" " IP adresu) vietiniame kompiuteryje.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEK nustatyti DNS paieÅ¡kos laukimo laikÄ… į " "SEK.\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEK nustatyti bandymo prisijungti laikÄ… į SEK.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEK nustatyti bandymo skaityti laikÄ… į SEK.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDÄ–S laukti SEKUNDES tarp siuntimų.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1769,7 +1744,7 @@ msgstr "" " --waitretry=SEK laukti 1..SEK tarp bandymų atsiusti iÅ¡ " "naujo.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1778,17 +1753,17 @@ msgstr "" " --random-wait laukti tarp 0...2*WAIT sekundžių tarp " "atsiuntimų.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy bÅ«tinai iÅ¡jungti tarpinÄ™ stotį.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=SKAIÄŒIUS nustatyti parsiuntimo į SKAIÄŒIŲ.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1797,18 +1772,18 @@ msgstr "" " --bind-address=ADRESAS susieti su ADRESU (kompiuterio vardu ar\n" " IP adresu) vietiniame kompiuteryje.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=GREITIS riboti atsiuntimo greitį iki GREIÄŒIO.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache iÅ¡jungti DNS paieÅ¡kų spartinimÄ….\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1817,7 +1792,7 @@ msgstr "" " --restrict-file-names=OS apriboti simbolius failų varduose į " "palaikomus OS.\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1826,17 +1801,17 @@ msgstr "" " --ignore-case ignoruoti registrÄ… filtruojant failus/" "aplankus.\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only jungtis tik prie IPv4 adresų.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only jungtis tik prie IPv6 adresų.\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1847,23 +1822,23 @@ msgstr "" "adresų:\n" " „IPv6“, „IPv4“ arba „none“.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=NAUDOTOJAS nustatyti FTP ir HTTP naudotojÄ….\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=SLAPTAŽODIS nustatyti FTP ir HTTP slaptažodį.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --password=SLAPTAŽODIS nustatyti FTP ir HTTP slaptažodį.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1874,89 +1849,88 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-proxy bÅ«tinai iÅ¡jungti tarpinÄ™ stotį.\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-glob iÅ¡jungti FTP failų vardų „globbing“.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" -msgstr " -Q, --quota=SKAIÄŒIUS nustatyti parsiuntimo į SKAIÄŒIŲ.\n" +msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Aplankai:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nekurti aplankų.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories priverstinai kurti aplankus.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories nekurti aplankų pagal kompiuterį.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories aplankuose naudoti protokolo vardÄ….\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" " -P, --directory-prefix=PREFIKSAS raÅ¡yti failus aplanke PREFIKSAS/...\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1965,32 +1939,32 @@ msgstr "" " --cut-dirs=SKAIÄŒIUS ignoruoti SKAIÄŒIŲ nutolusio aplanko " "komponentų.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP parametrai:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=NAUDOTOJAS nustatyti HTTP naudotojÄ….\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=SLAPTAŽODIS nustatyti HTTP slaptažodį.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache neleisti duomenų serverio kaupe.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -1998,18 +1972,18 @@ msgid "" msgstr "" " -E, --html-extension įraÅ¡yti HTML dokumentus su „.html“ priesaga.\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length ignoruoti „Content-Length“ antraÅ¡tÄ™.\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=TEKSTAS įterpti TEKSTÄ„ tarp antraÅ¡Äių.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2017,25 +1991,25 @@ msgid "" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalus peradresavimų skaiÄius puslapiui.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=NAUDOTOJAS nustatyti tarpinÄ—s stoties naudotojÄ….\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=SLAPTAŽODIS nustatyti tarpinÄ—s stoties slaptažodį.\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2044,12 +2018,12 @@ msgstr "" " --referer=URL įtraukti „Referer: URL“ antraÅ¡tÄ™ HTTP " "užklausoje.\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers įraÅ¡yti HTTP antraÅ¡tes į failÄ….\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2057,7 +2031,7 @@ msgid "" msgstr "" " -U, --user-agent=AGENTAS prisistatyti AGENTU vietoje „Wget/VERSIJA“.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2066,31 +2040,31 @@ msgstr "" " --no-http-keep-alive iÅ¡jungti HTTP keep-alive (ilgalaikiai " "prisijungimai).\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FAILAS įkrauti slapukus iÅ¡ FAILO prieÅ¡ sesijÄ….\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=FAILAS įraÅ¡yti slapukus į FAILÄ„ po sesijos.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --keep-session-cookies įkrauti ir įraÅ¡yti sesijos slapukus.\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2099,7 +2073,7 @@ msgstr "" " --post-data=TEKSTAS naudoti POST metodÄ…; siųsti TEKSTÄ„ kaip " "duomenis.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2107,12 +2081,12 @@ msgid "" msgstr "" " --post-file=FAILAS naudoti POST metodÄ…; siųsti FAILO turinį.\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2121,7 +2095,7 @@ msgstr "" " --post-data=TEKSTAS naudoti POST metodÄ…; siųsti TEKSTÄ„ kaip " "duomenis.\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2129,7 +2103,7 @@ msgid "" msgstr "" " --post-file=FAILAS naudoti POST metodÄ…; siųsti FAILO turinį.\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2141,13 +2115,13 @@ msgstr "" " parenkant vietinių failų vardus " "(EKSPERIMENTINIS).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2159,11 +2133,11 @@ msgstr "" "informacijÄ…\n" " nelaukiant serverio užklausimo.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) parametrai:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2173,45 +2147,45 @@ msgstr "" " --secure-protocol=PR rinktis saugų protokolÄ…: „auto“, „SSLv2“,\n" " „SSLv3“ arba „TLSv1“.\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative sekti tik reliatyvias nuorodas.\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate nevaliduoti serverio sertifikato.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FAILAS kliento sertifikato failas.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TIPAS kliento sertifikato tipas: PEM arba DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FAILAS privataus rakto failas.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TIPAS privataus rakto tipas: PEM arba DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FAILAS failas su CA rinkiniu.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " @@ -2220,12 +2194,12 @@ msgstr "" " --ca-directory=DIR aplankas, kuriame saugomas CA maišų " "sÄ…raÅ¡as.\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FAILAS failas su CA rinkiniu.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2235,7 +2209,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2244,7 +2218,7 @@ msgstr "" " --random-file=FAILAS failas su atsitiktiniais duomenimis SSL\n" " PRNG inicializacijai.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2253,65 +2227,65 @@ msgstr "" " --egd-file=FILE EGD lizdo failas su atsitiktiniais " "duomenimis.\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP parametrai:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache neleisti duomenų serverio kaupe.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=NAUDOTOJAS nustatyti FTP naudotojÄ….\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SLAPTAŽODIS nustatyti FTP slaptažodį.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neÅ¡alinti „.listing“ failų.\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob iÅ¡jungti FTP failų vardų „globbing“.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp iÅ¡jungti „pasyvią“ persiuntimo veiksenÄ….\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions iÅ¡saugoti nutolusio failo leidimus.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2320,54 +2294,54 @@ msgstr "" " --retr-symlinks siunÄiant rekursyviai, siųsti simbolinių\n" " nuorodų rodomus failus (ne aplankus).\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "FTP parametrai:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=TEKSTAS įterpti TEKSTÄ„ tarp antraÅ¡Äių.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2375,28 +2349,28 @@ msgstr "" " -t, --tries=SKAIÄŒIUS nustatyti bandymų parsiųsti SKAIÄŒIŲ (0 – " "neriboti).\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider nieko nesiųsti.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies nenaudoti slapukų.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2405,23 +2379,23 @@ msgstr "" " --ignore-case ignoruoti registrÄ… filtruojant failus/" "aplankus.\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursyvus siuntimas:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive siųsti failus rekursyviai.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2430,14 +2404,14 @@ msgstr "" " -l, --level=SKAIÄŒIUS maksimalus rekursijos gylis (inf arba 0 " "begalybei).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after iÅ¡trinti failus juos parsiuntus.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2447,19 +2421,19 @@ msgstr "" " -k, --convert-links pakeisti nuorodas parsiųstame HTML, kad rodytų\n" " į vietinius failus.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2469,7 +2443,7 @@ msgstr "" "atsarginÄ™\n" " kopijÄ… „X.orig“.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2479,7 +2453,7 @@ msgstr "" "atsarginÄ™\n" " kopijÄ… „X.orig“.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2487,7 +2461,7 @@ msgid "" msgstr "" " -m, --mirror „-N -r -l inf --no-remove-listing“ santrumpa.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2496,7 +2470,7 @@ msgstr "" " -p, --page-requisites parsiųsti visus paveikslÄ—lius ir kt. failus,\n" " reikalingus HTML puslapiui parodyti.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2505,11 +2479,11 @@ msgstr "" " --strict-comments įjungti griežtÄ… (SGML) HTML komentarų " "apdorojimÄ….\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekursyvus priÄ—mimas/atmetimas:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2518,7 +2492,7 @@ msgstr "" " -A, --accept=SÄ„RAÅ AS kableliais atskirtas imamų plÄ—tinių " "sÄ…raÅ¡as.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2527,27 +2501,27 @@ msgstr "" " -R, --reject=SÄ„RAÅ AS kableliais atskirtas atmetamų plÄ—tinių " "sÄ…raÅ¡as.\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --progress=TYPE nurodyti progreso indikatoriaus tipÄ….\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2555,7 +2529,7 @@ msgstr "" " -D, --domains=SÄ„RAÅ AS kableliais atskirtas imamų domenų " "sÄ…raÅ¡as.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" @@ -2563,14 +2537,14 @@ msgstr "" " --exclude-domains=SÄ„RAÅ AS kableliais atskirtas atmetamų domenų " "sÄ…raÅ¡as.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp siųsti FTP nuorodas iÅ¡ HTML dokumentų.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2579,7 +2553,7 @@ msgstr "" " --follow-tags=SÄ„RAÅ AS kableliais atskirtas sekamų HTML žymių " "sÄ…raÅ¡as.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2588,138 +2562,138 @@ msgstr "" " --ignore-tags=SÄ„RAÅ AS kableliais atskirtas ignoruojamų\n" " HTML žymių sÄ…raÅ¡as.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts eiti į kitus domenus siunÄiant " "rekursyviai.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative sekti tik reliatyvias nuorodas.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=SÄ„RAÅ AS leistinų aplankų sÄ…raÅ¡as.\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=SÄ„RAÅ AS atmetamų aplankų sÄ…raÅ¡as.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent neiti aukÅ¡tyn į tÄ—vinį aplankÄ….\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "" "Siųskite praneÅ¡imus apie klaidas ir pasiÅ«lymus adresu .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, neinteraktyvus parsiuntiklis.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2733,7 +2707,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2741,67 +2715,67 @@ msgstr "" "\n" "ParaÅ¡Ä— Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "" "Siųskite praneÅ¡imus apie klaidas ir pasiÅ«lymus adresu .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Pabandykite „%s --help“, jei norite daugiau informacijos.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: netaisyklingas parametras – „-n%c“\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Negalima tuo paÄiu metu bÅ«ti informatyviam ir tyliam.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Negalima tuo paÄiu metu dÄ—ti laiko žymes ir nekeisti senų failų.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Negalima kartu nurodyti --inet4-only ir --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2813,7 +2787,7 @@ msgstr "" "-p arba -r. Daugiau informacijos žinyne..\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2823,7 +2797,7 @@ msgstr "" "įraÅ¡ytas į vienintelį nurodytÄ… failÄ….\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2833,143 +2807,138 @@ msgstr "" "informacijos žinyne.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Failas „%s“ jau egzistuoja; nesiunÄiama.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, fuzzy, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Negalima kartu nurodyti --inet4-only ir --inet6-only.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: trÅ«ksta URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Negalima kartu nurodyti --inet4-only ir --inet6-only.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Negalima kartu nurodyti --inet4-only ir --inet6-only.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: nepavyko rasti adreso „%s“\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "%s nerasta URL adresų.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2979,7 +2948,7 @@ msgstr "" "BAIGTA --%s--\n" "Parsiųsta: %d failų, %s per %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Parsiuntimo kvota (%s) VIRÅ YTA!\n" @@ -3135,117 +3104,117 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Å alinamas %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "TÄ™siama fone.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "TÄ™siama fone, proceso numeris %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "IÅ¡vestis bus įraÅ¡yta į „%s“.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nepavyko rasti tinkamos lizdo valdyklÄ—s.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: įspÄ—jimas: „%s“ yra prieÅ¡ kompiuterio vardÄ…\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nežinomas elementas „%s“\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Naudojimas: %s NETRC [HOSTNAME]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nepavyko patikrinti %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "DÄ–MESIO: naudojamas silpnas „random seed“.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nepavyko inicializuoti PRNG; naudokite --random-file parametrÄ….\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, fuzzy, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: nepavyko verifikuoti %s sertifikato, iÅ¡duoto „%s“:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Nepavyko lokaliai verifikuoti iÅ¡davÄ—jo autoriteto.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Rastas savo-pasiraÅ¡ytas sertifikatas.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " IÅ¡duotas sertifikatas dar nevalidus.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " IÅ¡duoto sertifikato galiojimo laikas baigÄ—si.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, fuzzy, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "%s: sertifikato vardas „%s“ neatitinka kompiuterio vardo „%s“.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, fuzzy, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "%s: sertifikato vardas „%s“ neatitinka kompiuterio vardo „%s“.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3253,13 +3222,13 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Jei norite jungtis prie %s nesaugiai, naudokite „--no-check-certificate“.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3268,29 +3237,29 @@ msgstr "" "\n" "%*s[ praleidžiama %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Netaisyklinga .wgetrc specifikacija „%s“: paliekama nepakeista.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " per " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Nepavyko gauti realaus laiko laikrodžio dažnio: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Å alinamas %s, nes jis turÄ—tų bÅ«ti atmestas.\n" @@ -3304,22 +3273,22 @@ msgstr "Nepavyko atverti %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Ä®keliamas robots.txt; nekreipkite dÄ—mesio į klaidas.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Klaida apdorojant tarpinÄ—s stoties URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Klaida tarpinÄ—s stoties URL %s: Turi bÅ«ti HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "virÅ¡yta %d peradresavimų.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3327,7 +3296,7 @@ msgstr "" "Pasiduodama.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3335,124 +3304,124 @@ msgstr "" "Bandoma iÅ¡ naujo.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Jokios klaidos" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "Nepalaikoma schema" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Netaisyklingas kompiuterio vardas" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Netaisyklingas prievado numeris" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Netaisyklingas naudotojo vardas" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Nebaigtas IPv6 skaitinis adresas" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adresai nepalaikomi" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Netaisyklingas IPv6 skaitinis adresas" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, fuzzy, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Nepavyko iÅ¡skirti %ld baitų; baigÄ—si atmintis.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Nepavyko iÅ¡skirti %ld baitų; baigÄ—si atmintis.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "TÄ™siama fone, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nepavyko iÅ¡trinti simbolinÄ—s nuorodos „%s“: %s\n" -#: src/utils.c:884 -#, fuzzy, c-format +#: src/utils.c:879 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" +msgstr "" -#: src/utils.c:890 -#, fuzzy, c-format +#: src/utils.c:885 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Nepavyko paÅ¡alinti „%s“: %s\n" +msgstr "" -#: src/utils.c:897 +#: src/utils.c:892 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 -#, fuzzy, c-format +#: src/utils.c:937 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: nepavyko rasti adreso „%s“\n" +msgstr "" -#: src/utils.c:948 -#, fuzzy, c-format +#: src/utils.c:943 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "nepavyko prisijungti prie %s prievado %d: %s\n" +msgstr "" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Klaida raÅ¡ant į „%s“: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3530,6 +3499,41 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: parametras „--%s“ neleidžia argumento\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: neatpažintas parametras „--%s“\n" + +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: neleistinas pasirinkimas – %c\n" + +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: parametras „-W %s“ dviprasmis\n" + +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: parametras „-W %s“ neleidžia argumento\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Autorizavimas nepavyko.\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s parsiųsta.\n" + +#~ msgid "" +#~ " -B, --base=URL prepends URL to relative links in -F -i " +#~ "file.\n" +#~ msgstr "" +#~ " -B, --base=URL prideda URL prie nuorodų, esanÄių -F -i " +#~ "faile.\n" + +#~ msgid "Currently maintained by Micah Cowan .\n" +#~ msgstr "Å iuo metu prižiÅ«ri Micah Cowan .\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3552,30 +3556,3 @@ msgstr "" #~ msgstr[2] "" #~ "Rasta %d pasenusių nuorodų.\n" #~ "\n" - -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: NekorektiÅ¡kas URL adresas %s: %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s parsiųsta.\n" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: neleistinas pasirinkimas – %c\n" - -#~ msgid "Authorization failed.\n" -#~ msgstr "Autorizavimas nepavyko.\n" - -#~ msgid "" -#~ " -B, --base=URL prepends URL to relative links in -F -i " -#~ "file.\n" -#~ msgstr "" -#~ " -B, --base=URL prideda URL prie nuorodų, esanÄių -F -i " -#~ "faile.\n" - -#~ msgid "Currently maintained by Micah Cowan .\n" -#~ msgstr "Å iuo metu prižiÅ«ri Micah Cowan .\n" diff --git a/po/nb.gmo b/po/nb.gmo index 063908f..048b70f 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index da2e2ad..cf5b444 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-24 09:40+0100\n" "Last-Translator: Ã…ka Sikrom \n" "Language-Team: Norwegian Bokmaal \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ukjent systemfeil" @@ -28,7 +28,7 @@ msgstr "Ukjent systemfeil" msgid "Address family for hostname not supported" msgstr "Adressefamilie for vertsnavn støttes ikke" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Midlertidig feil i navnoppbygging" @@ -96,70 +96,45 @@ msgstr "Brutt av et signal" msgid "Parameter string not correctly encoded" msgstr "Parameter-strengen er ikke kodet korrekt" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ukjent feil" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valget «%s» er flertydig, og kan bety følgende:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valget «%s» er flertydig\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: valget «--%s» tillater ikke bruk av argumenter\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: valget «%s» er flertydig, og kan bety følgende:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: «%c%s» er et ukjent valg\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke bruk av argumenter\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valget «--%s» krever et argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: «--%s» er et ukjent valg\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: «%c%s» er et ukjent valg\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: «%c» er et ugyldig valg\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: «%c» krever et argument\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: valget «-W %s» er flertydig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: valget «-W %s» tillater ikke bruk av argumenter\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: valget «-W %s» krever et argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -179,13 +154,13 @@ msgstr "%s: valget «-W %s» krever et argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -257,28 +232,28 @@ msgstr "Regulært uttrykk er for stort" msgid "Unmatched ) or \\)" msgstr "Ingen treff pÃ¥ «)» eller «\\)»" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Intet tidligere regulært uttrykk" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "klarte ikke Ã¥ lage datarør" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "underprosess av %s mislyktes" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle mislyktes" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "klarte ikke Ã¥ gjenopprette fd %d. dup2 mislyktes" @@ -297,51 +272,51 @@ msgstr "underprosess av %s fikk kritisk feilsignal %d" msgid "memory exhausted" msgstr "minnet er oppbrukt" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: klarte ikke Ã¥ slÃ¥ opp tildelt adresse %s. SlÃ¥r av tildeling.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Kobler til %s|%s|:%d …" -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Kobler til %s:%d …" -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Kobler til [%s]:%d …" -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF mislyktes: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "tilkoblet.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "mislyktes: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: klarte ikke Ã¥ slÃ¥ opp vertsnavn %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR mislyktes: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -377,174 +352,174 @@ msgstr "Klarte ikke Ã¥ slette %s. %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Klarte ikke Ã¥ sikkerhetskopiere %s som %s. %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Klarte ikke Ã¥ hente informasjonskapsel for %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaksfeil i Set-Cookie: %s ved posisjon %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "En informasjonskapsel fra %s prøvde Ã¥ sette domene til" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Klarte ikke Ã¥ Ã¥pne informasjonskapsel-fila %s. %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Feil ved skriving til %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Feil ved lukking av %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Visningstypen støttes ikke. Prøver Unix-visningstolk.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks av /%s pÃ¥ %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "ukjent tidspunkt " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fil" -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Mappe" -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Lenke" -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Usikkert" -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Lengde: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) gjenstÃ¥r" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s gjenstÃ¥r" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (ikke-autorativ)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Klarte ikke Ã¥ starte SSL. SSL blir derfor slÃ¥tt av." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Logger inn som %s … " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Feil i tjenerresponsen. Lukker kontrolltilkobling.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Feil i hilsemelding fra tjener.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Skriving mislyktes. Lukker kontrolltilkobling.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Tjeneren nekter innlogging.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Feil brukernavn/passord.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Du er nÃ¥ logget inn.\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Tjeneren godtok ikke kommandoen «PBSZ 0».\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Tjeneren godtok ikke kommandoen «PROT %c».\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Tjenerfeil. Klarte ikke Ã¥ finne systemtype.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "ferdig. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "ferdig.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "«%c» er en ukjent type. Lukker kontrolltilkobling.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "ferdig. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD er unødvendig.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Logisk ugyldig seksjon er nÃ¥dd i getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -555,7 +530,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -564,37 +539,37 @@ msgstr "" "Mappa %s finnes ikke.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD kreves ikke.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Fila er allerede hentet.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Klarte ikke Ã¥ starte PASV-overføring.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Klarte ikke Ã¥ tolke PASV-respons.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "klarte ikke Ã¥ koble til %s, port %d. %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Blindfeil (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ugyldig PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -602,17 +577,17 @@ msgstr "" "\n" "REST mislyktes. Begynner pÃ¥ nytt.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Fila %s finnes.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Fila %s finnes ikke.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -621,7 +596,7 @@ msgstr "" "Fila %s finnes ikke.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -630,40 +605,40 @@ msgstr "" "Fila eller mappa %s finnes ikke.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s har begynt Ã¥ eksistere.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s. Lukker kontrolltilkobling.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - datatilkobling: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Kontrolltilkobling er lukket.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Dataoverføring avbrutt.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Fila %s ligger allerede der, og blir ikke hentet pÃ¥ nytt.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(prøv:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -672,7 +647,7 @@ msgstr "" "%s (%s) - skrevet til standard utkanal %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -681,42 +656,42 @@ msgstr "" "%s (%s) - %s lagret [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Fjerner %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Bruker %s som midlertidig listefil.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Fjernet %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Hierarkidybde %d overskredet maksimumsdybden %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Ekstern fil er ikke nyere enn den lokale fila %s, og blir derfor lastet " "ned.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "Ekstern fil er nyere enn den lokale fila %s, og blir lastet ned.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -725,11 +700,11 @@ msgstr "" "Filene har ulik størrelse (%s lokalt), og den eksterne kopien lastes ned.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ugyldig navn pÃ¥ symbolsk lenke. Hopper over.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -738,242 +713,242 @@ msgstr "" "Korrekt symbolsk lenke %s -> %s finnes allerede\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Lager symbolsk lenke %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Symbolske lenker støttes ikke. Hopper over %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Hopper over mappa %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: filtypen er ukjent eller støttes ikke.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: ødelagt tidsstempel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Mapper blir ikke lastet ned, fordi hierarkidybden er %d (maksgrense er %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Tar ikke med innholdet i %s, fordi den er valgt utelukket.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Avviser %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Feil ved utlikning av %s mot %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ingen treff pÃ¥ mønsteret %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Lagret indeks i HTML-format til %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Lagret indeks i HTML-format til %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Feil: Klarte ikke Ã¥ Ã¥pne mappa %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEIL: Klarte ikke Ã¥ Ã¥pne sertifikatet s%s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Lastet inn CA-sertifikat «%s»\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "FEIL: Klarte ikke Ã¥ laste inn CRL-fil «%s»: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Latet inn CRL-fil «%s»\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "FEIL: GnuTLS krever at nøkler og sertifikater skal være av samme type.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: verdi %d er ikke implementert for valget «secure-protocol»\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Du bør rapportere dette problemet til bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: verdi %d er ikke implementert for valget «secure-protocol»\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "FEIL" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "ADVARSEL" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s la ikke frem et sertifikat.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Sertifikatet pÃ¥ %s regnes ikke som pÃ¥litelig.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Sertifikatet pÃ¥ %s kommer ikke fra en kjent utgiver.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Sertifikatet pÃ¥ %s er tilbakekalt.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" "%s: Attestanten for sertifikatet %s er ikke en CA " "(sertifiseringsmyndighet).\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Sertifikatet pÃ¥ %s er signert med en usikker algoritme.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Sertifikatet pÃ¥ %s er ikke aktivt ennÃ¥.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Sertifikatet pÃ¥ %s er utgÃ¥tt.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Feil ved innlasting av X509-sertifikat: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Fant ingen sertifikat\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Feil ved lesing av sertifikat: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Sertifikatet er ikke aktivt ennÃ¥\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Sertifikatet er utgÃ¥tt\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Sertifikatets eier samsvarer ikke med vertsnavnet %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Offentlig nøkkel samsvarer ikke med tilknyttet offentlig nøkkel.\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Sertifikatet mÃ¥ være av typen X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Feil ved behandling av adresseliste.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ukjent vert" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "SlÃ¥r opp vertsnavn %s … " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "mislyktes: Ingen IPv4-/IPv6-adresser for vertsnavnet.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "mislyktes: tidsavbrudd.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Klarte ikke Ã¥ gjøre oppslag pÃ¥ ufullstendig lenke %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: %s er en ugyldig nettadresse. %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Feil ved skriving av HTTP-forespørsel: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Ingen linjer. Antar at HTTP/0.9 er gjeldende" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -982,11 +957,11 @@ msgstr "" "Fila %s ligger allerede der, og blir ikke lastet ned pÃ¥ nytt.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime mislyktes. Dette er sannsynligvis en programfeil.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -994,55 +969,55 @@ msgstr "" "Klarte ikke Ã¥ konvertere tidsstempel til http-format. Bruker «time 0» som " "tidspunkt for endring.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-datafila %s mangler: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Bruker etablert tilkobling til [%s]:%d pÃ¥ nytt.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Bruker etablert tilkobling til %s:%d pÃ¥ nytt.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lesing av respons fra mellomtjener mislyktes: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s PROGRAMFEIL %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Feilutformet statuslinje" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunnelsending via mellomtjener mislyktes: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ukjent autentiseringsmetode.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Autentisering valgt: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Lagrer til: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1051,21 +1026,21 @@ msgstr "" "Ved nedlasting av signatur:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Klarte ikke Ã¥ lese signaturinnhold i midlertidig fil. Hopper over.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Klarte ikke Ã¥ lage midlertidig fil. Hopper over nedlasting av signatur.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Ugyldig pri-verdi. Bruker %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1073,42 +1048,42 @@ msgstr "" "Fant ingen akseptabel behandlingsmetode for Metalink-ressurser.\n" "De blir derfor ignorert.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SlÃ¥r av SSL pÃ¥ grunn av oppstÃ¥tte programfeil.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-forespørsel sendt. Venter pÃ¥ svar … " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ingen data mottatt.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lesefeil (%s) i hodelinjer.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(ingen beskrivelse)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Plassering: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "ikke angitt" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [følgende]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1117,7 +1092,7 @@ msgstr "" "Fila %s er ikke endret pÃ¥ tjener. Lar være Ã¥ laste ned.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1128,7 +1103,7 @@ msgstr "" "Du bør vurdere Ã¥ bruke valget «--no-if-modified-since».\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1138,81 +1113,81 @@ msgstr "" " Fila er allerede lastet ned i sin helhet.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Lengde: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorert" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Advarsel: jokertegn støttes ikke i HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Edderkoppmodus er slÃ¥tt pÃ¥. Kontroller om ekstern fil finnes.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Klarte ikke Ã¥ skrive til %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Obligatorisk attributt mangler pÃ¥ mottatt linje.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Autentisering med brukernavn og passord mislyktes.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til WARC-fil.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Klarte ikke Ã¥ skrive til midlertidig WARC-fil.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Klarte ikke Ã¥ sette opp SSL-tilkobling.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Klarte ikke Ã¥ fjerne lenke til %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "PROGRAMFEIL: Videresending (%d) uten plassering.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Fant ingen Metalink-data i HTTP-svar. Bruker HTTP GET til Ã¥ laste ned.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Fant Metalink-hoder. GÃ¥r i Metalink-modus.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Ekstern fil finnes ikke. Død lenke!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Linja «Last-modified» mangler. Tidsstempler er slÃ¥tt av.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Linja «Last-modified» er ugyldig. Tidsstempler ignoreres.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1222,16 +1197,16 @@ msgstr "" "lastet ned.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Filene er av ulik størrelse (lokal: %s). Laster ned.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Ekstern versjon av fila er nyest, og blir lastet ned.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1241,7 +1216,7 @@ msgstr "" "ned.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1249,7 +1224,7 @@ msgstr "" "Ekstern fil finnes, men inneholder ingen lenke. Laster ikke ned.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1259,7 +1234,7 @@ msgstr "" "men jobbing i undermapper er slÃ¥tt av. Laster ikke ned.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1267,12 +1242,12 @@ msgstr "" "Ekstern fil finnes.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s nettadresse: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1281,7 +1256,7 @@ msgstr "" "%s (%s) - skrevet til standard utkanal %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1290,58 +1265,58 @@ msgstr "" "%s (%s) - %s lagret [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Tilkobling lukket ved byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lesefeil ved byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lesefeil ved byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Beskyttelseskvalitet «%s» støttes ikke.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen «%s» støttes ikke.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC peker pÃ¥ %s, som ikke finnes.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Klarte ikke Ã¥ lese %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Feil i %s pÃ¥ linje %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaksfeil i %s pÃ¥ linje %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: %s er en ukjent kommando i %s pÃ¥ linje %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1353,7 +1328,7 @@ msgstr "" "«%s»,\n" "eller velg en annen fil med «--config».\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1364,49 +1339,49 @@ msgstr "" "«%s»,\n" "eller velg en annen fil med «--config».\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Advarsel: BÃ¥de systemet og wgetrc peker pÃ¥ %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: %s er en ugyldig «--execute»-kommando\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: %s er en ugyldig boolsk verdi. Bruk «on» (pÃ¥) eller «off» (av).\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: Ugyldig %s. Bruk «on» (pÃ¥), «off» (av) eller «quiet» (stille).\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: %s er et ugyldig tall.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s kan bare brukes én gang\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: %s er en ugyldig byte-verdi\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s er en ugyldig tidsperiode\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1415,28 +1390,28 @@ msgstr "" "use-askpass krever at miljøvariabel WGET_ASKPASS eller SSH_ASKPASS har en " "verdi.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: %s er en ugyldig verdi.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: %s er en ugyldig linje.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: %s er en ugyldig WARC-linje.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: %s er en ugyldig framdriftstype.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1445,40 +1420,40 @@ msgstr "" "%s: %s: %s er en ugyldig restriksjon.\n" " Bruk [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodinga %s er ugyldig\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konvertering fra %s til %s støttes ikke\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Fant ufullstendig eller ugyldig multibyte-sekvens\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "UhÃ¥ndtert feilnummer %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: region er ikke valgt\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode mislyktes (%d). %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Klarte ikke Ã¥ konvertere til smÃ¥ bokstaver: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1487,17 +1462,17 @@ msgstr "" "\n" "Videresender utdata til %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s. SlÃ¥r av loggføring.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Bruk: %s [VALG] … [NETTADRESSE] …\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1506,62 +1481,62 @@ msgstr "" "korte valg.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Oppstart:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version vis versjonsinformasjon og avslutt.\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help vis denne hjelpeteksten\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background kjør i bakgrunnen etter oppstart\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=KOMMANDO kjør en kommando i «.wgetrc»-stil\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Loggføring og inndatafil:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FIL loggfør meldinger i valgt FIL\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FIL legg til meldinger i valgt FIL\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug skriv ut en haug av " "feilsøkingsinformasjon\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug skriv ut Watt-32-feilsøkingsinformasjon\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stillemodus (ingen utdata)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose skriv ut detaljert info (dette er " "standard)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1569,13 +1544,13 @@ msgstr "" " -nv, --no-verbose ikke skriv ut detaljer, men ikke vær helt " "stille\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr " --report-speed=TYPE vis bÃ¥ndbredde som valgt TYPE bit\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1583,7 +1558,7 @@ msgstr "" " -i, --input-file=FIL last ned nettadresser som finnes i valgt " "FIL\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1591,11 +1566,11 @@ msgstr "" " --input-metalink=FIL last ned filer som stÃ¥r oppført i lokal " "Metalink-FIL\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandle inndatafil som HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1604,42 +1579,42 @@ msgstr "" "F»)\n" " relativt til valgt nettADResse\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=FIL velg oppsettsfil som skal brukes\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config ikke les oppsettsfil(er)\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FIL loggfør URL-avvisninger i valgt FIL\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Last ned:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=ANT velg ANTall nye forsøk (0 betyr ubegrenset)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused prøv pÃ¥ nytt selv om tilkobling nektes\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL lagre dokumenter i valgt FIL\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1647,14 +1622,14 @@ msgstr "" " -nc, --no-clobber hopp over nedlastinger som ville ha\n" " overskrevet eksisterende filer\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config ikke les oppsettsfil(er)\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1662,7 +1637,7 @@ msgstr "" " -c, --continue fortsett nedlasting av en delvis " "nedlastet fil\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1670,11 +1645,11 @@ msgstr "" " --start-pos=POS start nedlasting fra valgt POSisjon, talt fra " "null\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE velg en TYPE framdriftsviser\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1682,7 +1657,7 @@ msgstr "" " --show-progress vis framdriftsviser uansett grad av " "detaljer som skrives ut\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1691,7 +1666,7 @@ msgstr "" " -N, --timestamping ikke hent filer pÃ¥ nytt med mindre de er\n" " nyere enn de lokale\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1700,7 +1675,7 @@ msgstr "" " --no-if-modified-since ikke bruk betinget «if-modified-since»\n" " forespørsler i tidsstempel-modus\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1708,21 +1683,21 @@ msgstr "" " --no-use-server-timestamps ikke gi lokale filer samme tidsstempel\n" " som tjenerens filer\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response skriv ut svarmelding fra tjener\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ikke last ned noe\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDER bruk valgt antall SEKUNDER som generelt " "tidsavbrudd\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1730,7 +1705,7 @@ msgstr "" " --dns-servers=ADRESSER liste over DNS-tjenere som skal spørres " "(adskilt med komma)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1738,31 +1713,31 @@ msgstr "" " --bind-dns-address=ADRESSE knytt DNS-oppslagsverktøy til valgt " "ADRESSE (vertsnavn eller IP) pÃ¥ lokal vert\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEK bruk valgt antall SEKunder som DNS-" "tidsavbrudd\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEK bruk valgt antall SEKunder som " "tidsavbrudd for tilkobling\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEK bruk valgt antall SEKunder som " "tidsavbrudd for lesing\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEK ta en pause i valgt antall SEKunder før " "neste fil hentes\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1770,7 +1745,7 @@ msgstr "" " --waitretry=SEKUNDER vent 1…SEKunder mellom gjentatte forsøk " "pÃ¥ nedlasting\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1778,17 +1753,17 @@ msgstr "" " --random-wait vent fra 0.5*WAIT … 1.5*WAIT sekunder " "mellom nedlastinger\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy la aktivt være Ã¥ bruke mellomtjener\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ANTALL bruk valgt ANTALL nedlastinger som kvote\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1796,16 +1771,16 @@ msgstr "" " --bind-address=ADRESSE tildel lokal vert valgt ADRESSE " "(vertsnavn eller IP)\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=FART begrens nedlasting til valgt FART\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache slÃ¥ av hurtiglagring av DNS-oppslag\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1813,7 +1788,7 @@ msgstr "" " --restrict-file-names=OS bare la filnavn inneholde tegn som " "operativsystemet tillater\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1821,15 +1796,15 @@ msgstr "" " --ignore-case ikke skill mellom store og smÃ¥ bokstaver " "ved sammenlikning av filer og mapper\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only bare koble til IPv4-adresser\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only bare koble til IPv6-adresser\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1839,24 +1814,24 @@ msgstr "" "valgt familie\n" " (enten «IPv6», «IPv4», eller «none»)\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=BRUKER bruk valgt BRUKER som bÃ¥de ftp- og http-" "bruker\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PASS bruk valgt PASSord som bÃ¥de ftp- og http-" "passord\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password be om passord\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1874,27 +1849,27 @@ msgstr "" "WGET_ASKPASS eller\n" " SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri slÃ¥ av IRI-støtte\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr " --local-encoding=KOD bruk valgt lokal KODing av IRI-er\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KOD bruk valgt KODing som standard ekstern " "koding\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink fjern fil før ting blir rotete\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1902,7 +1877,7 @@ msgstr "" " --keep-badhash behold filer som ikke samsvarer med " "kontrollsum (legg til «.badhash»)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1910,7 +1885,7 @@ msgstr "" " --metalink-index=TALL Metalenke application/metalink4+xml meta-" "adresse ordinær TALL\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1918,7 +1893,7 @@ msgstr "" " --metalink-over-http bruk Metalink-metadata fra HTTP-" "svarhoder\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1926,7 +1901,7 @@ msgstr "" " --preferred-location foretrukket plassering av Metalink-" "ressurser\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1934,31 +1909,31 @@ msgstr "" " --no-xattr slÃ¥ av lagring av metadata i utvidede " "filattributter\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Mapper:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ikke lag nye mapper\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tving opprettelse av mapper\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ikke lag vertsmapper\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories bruk protokollnavn pÃ¥ mapper\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIKS lagre filer i PREFIKS/…\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1966,26 +1941,26 @@ msgstr "" " --cut-dirs=ANTALL ignorer valgt ANTALL eksterne " "mappekomponenter\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-valg:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=BRUKER bruk valgt BRUKER som http-bruker\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=PASS bruk valgt PASSord som http-passord\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache ikke tillat mellomlagring av data pÃ¥ " "tjener\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1993,7 +1968,7 @@ msgstr "" " --default-page=NAVN Endre standard sidenavn (vanligvis «index." "html»)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2001,52 +1976,52 @@ msgstr "" " -E, --adjust-extension lagre HTML-/CSS-dokumenter med korrekt " "filetternavn\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length ignorer «Content-Length»-linja\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRENG sett inn STRENG blant hodelinjene\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYPE velg en TYPE framdriftsviser\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksimalt antall videresendinger per side\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=BRUKER bruk valgt BRUKER som mellomtjener-" "brukernavn\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PASS bruk valgt PASSord som mellomtjener-" "passord\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" " --referer=ADR ta med «Referer: ADR» i HTTP-forespørsel\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers lagre HTTP-hodelinjer i en fil\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2054,7 +2029,7 @@ msgstr "" " -U, --user-agent=AGENT oppgi valgt AGENTnavn, i stedet for «Wget/" "VERSJON»\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2062,24 +2037,24 @@ msgstr "" " --no-http-keep-alive slÃ¥ av «HTTP keep-alive» (bevaring av " "forbindelser)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ikke bruk informasjonskapsler\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FIL last inn infokapsler fra valgt FIL før en " "økt startes\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FIL lagre infokapsler i valgt FIL nÃ¥r økta er " "ferdig\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2087,14 +2062,14 @@ msgstr "" " --keep-session-cookies last inn og lagre (ikke-permanente) " "infokapsler for økter\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=STRENG bruk POST-metoden og send valgt STRENG\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2102,13 +2077,13 @@ msgstr "" " --post-file=FIL bruk POST-metoden og send innholdet i " "valgt FIL\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTP-metode bruk metoden «HTTP-metode» i HTTP-hodet\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2116,7 +2091,7 @@ msgstr "" " --body-data=STRENG send valgt STRENG som data (NB: «--" "method» MÃ… være valgt)\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2124,7 +2099,7 @@ msgstr "" " --body-file=FIL send innhold i valgt FIL (NB: «--method» " "MÃ… være valgt)\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2135,7 +2110,7 @@ msgstr "" "ved\n" " valg av filnavn (USTABILT)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2143,7 +2118,7 @@ msgstr "" " --content-on-error skriv ut mottatt innhold i feilmeldinger " "fra tjener\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2154,11 +2129,11 @@ msgstr "" " uten Ã¥ vente pÃ¥ etterspørsel fra\n" " tjeneren.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS(SSL-/TLS-)-valg :\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2169,43 +2144,43 @@ msgstr "" "«SSLv2»,\n" " «SSLv3», «TLSv1» eller «PFS».\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only bare følg HTTPS-lenker\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate ikke kontroller tjenerens sertifikat\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientens sertifikatFIL\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE klientens sertifikatTYPE («PEM» eller " "«DER»)\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL privatnøkkel-FIL\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYPE type privatnøkkel («PEM» eller «DER»)\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=FIL fil med liste over CA-er " "(sertifikatutstedere)\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2213,11 +2188,11 @@ msgstr "" " --ca-directory=MAPPE hvilken MAPPE nøkkellista over CA-er " "ligger i\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FIL fil med liste over CRL-er\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2232,14 +2207,14 @@ msgstr "" " sha256-kontrollsummer adskilt med «;»,\n" " til bekreftelse av motpart\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=FIL fil med vilkÃ¥rlighetsdata for SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2247,15 +2222,15 @@ msgstr "" " --egd-file=FIL fil med vilkÃ¥rlighetsdata for navngivning " "av EGD-sokkel\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS-valg:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts slÃ¥ av HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2263,11 +2238,11 @@ msgstr "" " --hsts-file sti til HSTS-database (overstyrer " "standardsti)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-valg:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2275,36 +2250,36 @@ msgstr "" " --ftp-stmlf bruk formatet Stream_LF pÃ¥ alle binære " "FTP-filer\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=BRUKER bruk valgt BRUKER som ftp-bruker\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PASS bruk valgt PASSord som ftp-passord\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ikke fjern «.listing»-filer\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob skru av bruk av jokertegn i FTP-filnavn\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp slÃ¥ av «passiv» overføringsmodus\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions behold tjenerens oppsett av " "filtillatelser\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2312,11 +2287,11 @@ msgstr "" " --retr-symlinks hent lenkemÃ¥l (unntatt mapper) ved arbeid " "i mappehierarkier\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS-valg:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2324,7 +2299,7 @@ msgstr "" " --ftps-implicit bruk implisitt FTPS (standardport er " "990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2334,7 +2309,7 @@ msgstr "" "kontrolltilkobling ved Ã¥pning av\n" " datatilkobling\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2342,7 +2317,7 @@ msgstr "" " --ftps-clear-data-connection bare krypter kontroll-kanalen (alle " "data sendes i form av ren tekst)\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2350,11 +2325,11 @@ msgstr "" " --ftps-fallback-to-ftp bruk FTP hvis FTPS ikke støttes av " "tjeneren\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC-valg:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2362,25 +2337,25 @@ msgstr "" " --warc-file=FILNAVN lagre foresp.-/svardata i en «.warc.gz»-" "fil\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=STRENG sett inn valgt STRENG i warcinfo-" "oppføringa\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=TALL bruk valgt TALL som maksimal størrelse pÃ¥ " "WARC-filer\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skriv CDX-indeksfiler\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2388,24 +2363,24 @@ msgstr "" " --warc-dedup=FILNAVN ikke lagre oppføringer som er oppført i " "denne CDX-fila\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression ikke komprimer WARC-filer med GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ikke beregn SHA1-kontrollsummer\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log ikke lagre loggfil i en WARC-oppføring\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2413,17 +2388,17 @@ msgid "" msgstr "" " --warc-tempdir=MAPPE plassering av midlertidige WARC-filer\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Nedlasting av underliggende hierarki:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive last ned underliggende filer og/eller " "mapper\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2431,7 +2406,7 @@ msgstr "" " -l, --level=TALL maksimal hierarkidybde (bruk «inf» eller 0 " "for ubegrenset)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2439,7 +2414,7 @@ msgstr "" " --delete-after slett filer lokalt nÃ¥ de er ferdig lastet " "ned\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2449,7 +2424,7 @@ msgstr "" "eller CSS-filer,\n" " slik at de peker pÃ¥ lokale filer\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2457,7 +2432,7 @@ msgstr "" " --convert-file-only bare konverter fil-del av adresser " "(vanligvis kjent som basenavn eller «basename»)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2465,7 +2440,7 @@ msgstr "" " --backups=N rullér pÃ¥ N antall sikkerhetskopier før " "fil X lagres\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2473,7 +2448,7 @@ msgstr "" " -K, --backup-converted sikkerhetskopier fil X som X_orig før den " "konverteres\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2481,7 +2456,7 @@ msgstr "" " -K, --backup-converted sikkerhetskopier fil X som X_orig før den " "konverteres\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2489,7 +2464,7 @@ msgstr "" " -m, --mirror tilsvarer «-N -r -l inf --no-remove-" "listing»\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2497,7 +2472,7 @@ msgstr "" " -p, --page-requisites hent alle bilder osv. som behøves for Ã¥ " "vise aktuelle HTML-sider\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2505,11 +2480,11 @@ msgstr "" " --strict-comments slÃ¥ pÃ¥ streng hÃ¥ndtering av HTML-" "kommentarer (SGML)\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Godkjenning/avvisning i hierarkier:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2517,7 +2492,7 @@ msgstr "" " -A, --accept=LISTE kommaseparert liste over filetternavn som " "skal godtas\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2525,45 +2500,45 @@ msgstr "" " -R, --reject=LISTE kommaseparert liste over filetternavn som " "skal avvises\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REG.UTTR. uttrykk for nettadresser som skal godtas\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REG.UTTR. uttrykk for nettadresser som skal " "avvises\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TYPE uttrykkstype (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYPE uttrykkstype (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTE kommaseparert liste over domener som skal " "godtas\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTE kommaseparert liste over domener som skal " "avvises\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp følg FTP-lenker i HTML-dokumenter\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2571,7 +2546,7 @@ msgstr "" " --follow-tags=LISTE kommaseparert liste over HTML-tagger som " "skal følges\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2579,21 +2554,21 @@ msgstr "" " --ignore-tags=LISTE kommaseparert liste over HTML-tagger som " "skal ignoreres\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts følg hierarkiske stier som leder til " "tredjepartsvert\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative bare følg relative lenker\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE liste over mapper som skal godtas\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2602,82 +2577,82 @@ msgstr "" " --trust-server-names bruk navn fra siste del av " "videresendingsadressen\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LISTE liste over mapper som skal utelukkes\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ikke gÃ¥ opp til foreldermappa\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Send feilrapporter og forslag til \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, et ikke-interaktivt nedlastingsverktøy.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Passord for %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Passord: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Klarte ikke Ã¥ lage datarør\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Feil under oppstart av filhandlinger for use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Feil under oppsett av filhandlinger for use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Feil under lesing av kommandosvar «%s %s»: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Brukernavn for «%s%s»: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Passord «%s%s@%s»: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Region: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Lenke: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2686,29 +2661,29 @@ msgstr "" "GNU Wget %s bygget %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (miljø)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (bruker)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Opphavsrett (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2723,7 +2698,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2731,36 +2706,36 @@ msgstr "" "\n" "Opprinnelig skrevet av Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Send feilrapporter og spørsmÃ¥l til.\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Minnetidelingsfeil\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Avslutter pÃ¥ grunn av problemer med %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prøv «%s --help» for flere valg.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: «-n%c» er et ugyldig valg\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Feilsøkingsstøtte er ikke innebygd. Valget «--debug» ignoreres.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2769,7 +2744,7 @@ msgstr "" "Du har valgt bÃ¥de «--no-clobber» og «--convert-links». Det er bare «--" "convert-links» som blir brukt.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2778,23 +2753,23 @@ msgstr "" "Du har valgt bÃ¥de «--no-clobber» og «--convert-file-only». Kun sistnevnt " "blir brukt.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Du kan ikke velge bÃ¥de stille- og detaljert modus samtidig.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Du kan ikke velge bÃ¥de tidsstempling og ryddighold av gamle filer samtidig.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Du kan ikke velge bÃ¥de «--inet4-only» og «--inet6-only» samtidig.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2806,7 +2781,7 @@ msgstr "" "«-p» eller «-r» er valgt. Se bruksanvisning for mer info.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2817,7 +2792,7 @@ msgstr "" "legges i den ene fila du valgte.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2827,12 +2802,7 @@ msgstr "" "Les bruksanvisninga for ytterligere info.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Fila «%s» ligger der allerede, og blir ikke lastet ned igjen.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2840,7 +2810,7 @@ msgstr "" "WARC-utdata fungerer ikke i kombinasjon med «--no-clobber». «--no-clobber» " "blir derfor slÃ¥tt av.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2848,12 +2818,12 @@ msgstr "" "WARC-utdata fungerer ikke i kombinasjon med tidsstempling. Tidsstempling " "blir derfor slÃ¥tt av.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-utdata fungerer ikke i kombinasjon med «--spider».\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2862,7 +2832,7 @@ msgstr "" "WARC-utdata fungerer ikke i kombinasjon med «--continue». Begge deler blir " "derfor slÃ¥tt av.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2870,7 +2840,7 @@ msgstr "" "Kontrollsummering er slÃ¥tt av. WARCs anti-duplikatverktøy er ute av stand " "til Ã¥ finne duplikater.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2879,12 +2849,12 @@ msgstr "" "WARC-utdata fungerer ikke i kombinasjon med «--continue». Begge deler blir " "derfor slÃ¥tt av.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Du kan ikke bruke bÃ¥de «--ask-password» og «--password» samtidig.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2893,17 +2863,17 @@ msgstr "" "Bruk av «--start-pos» og «--continue» samtidig anbefales ikke. «--continue» " "blir derofr slÃ¥tt av.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: nettadresse mangler\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Du kan ikke bruke bÃ¥de «--post-data» og «--post-file» samtidig.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2912,7 +2882,7 @@ msgstr "" "«--post-data» og «--post-file» kan ikke brukes i kombinasjon med «--method». " "Sistnevnte forventer data via valgene «--body-data» og «--body-file»\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2921,17 +2891,17 @@ msgstr "" "Valgene «--body-data» eller «--body-file» krever at du velger «--method=HTTP-" "METODE» .\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Du kan ikke bruke bÃ¥de «--body-data» og «--body-file».\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Denne versjonen støtter ikke IRI-er\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2939,7 +2909,7 @@ msgstr "" "Valgene «-k» og «-r» kan bare brukes samtidig med «-O» hvis utdata er en " "vanlig fil.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2948,42 +2918,42 @@ msgstr "" "valgene «--convert-links» og «--convert-file-only» kan bare brukes samtidig " "hvis utdata er en vanlig fil.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Klarte ikke Ã¥ starte libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Klarte ikke Ã¥ starte «c-ares»-kanal\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Klarte ikke Ã¥ tolke IP-adresse «%s»\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Klarte ikke Ã¥ endre DNS-tjener(e) «%s» (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Fant ingen nettadresser i %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Klarte ikke Ã¥ lese metalink-fila %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Klarte ikke Ã¥ laste ned alle ressurser fra %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2994,7 +2964,7 @@ msgstr "" "Totalt medgÃ¥tt tid: %s\n" "Lastet ned: %d filer, %s pÃ¥ %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Nedlastingsgrense pÃ¥ %s OVERSKREDET!\n" @@ -3150,106 +3120,106 @@ msgstr "Fila %s ble hentet, men signaturen stemmer ikke. \n" msgid "Renaming %s to %s.\n" msgstr "Endrer navn pÃ¥ %s til %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Fortsetter i bakgrunnen.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Fortsetter i bakgrunnen med PID %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Utdata blir skrevet til %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() mislyktes\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() mislyktes\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Fant ingen brukbar sokkeldriver.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() mislyktes. Klarte ikke Ã¥ sette opp sokkelen som blokkering.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: advarsel: symbolet %s dukker opp før maskinnavn\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: «%s» er et ukjent symbol\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Bruk: %s NETRC [VERTSNAVN]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: klarte ikke Ã¥ lage statistikk av %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "ADVARSEL: du bruker en svak kilde for vilkÃ¥rlighetsdata.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Klarte ikke Ã¥ bruke tilfeldighetsdata med PRNG. Du bør vurdere Ã¥ bruke " "valget «--random-file».\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Installert OpenSSL-versjon er for gammel til Ã¥ støtte TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Installert OpenSSL-versjon er for gammel til Ã¥ støtte TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: verdi %d er ikke implementert for valget «secure-protocol»\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: sertifikat for %s (utgitt av %s) kunne ikke bekreftes.\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Klarte ikke Ã¥ bekrefte utgiverens autoritet lokalt.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Mottok selvgenerert sertifikat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Mottatt sertifikat er ikke gyldig ennÃ¥.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Mottatt sertifikat er utgÃ¥tt.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3258,14 +3228,14 @@ msgstr "" "%s: ingen alternative navn pÃ¥ sertifikatsubjektet\n" "\tsamsvarer med vertsnavn %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: sertifikatnavnet %s samsvarer ikke med forespurt vertsnavn %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3276,12 +3246,12 @@ msgstr "" " Dette kan bety at verten ikke er den den utgir seg for Ã¥ være\n" " (tjeneren er altsÃ¥ ikke den egentlige %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Bruk «--no-check-certificate» for Ã¥ koble til %s uten sikkerhet.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3290,28 +3260,28 @@ msgstr "" "\n" "%*s[ hopper over %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "%s er en ugyldig punktstil-spesifikasjon. Lar den stÃ¥ uendret.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " pÃ¥ " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Klarte ikke Ã¥ hente klokkefrekvensen for REALTIME. %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Fjerner %s, fordi den skal avvises.\n" @@ -3325,22 +3295,22 @@ msgstr "Klarte ikke Ã¥ Ã¥pne %s. %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laster inn «robots.txt». Ignorer feilmeldinger.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Feil ved tolkning av nettadressen %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Feil i mellomtjeneradressen %s. Denne mÃ¥ være HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d videresendinger overskredet.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3348,7 +3318,7 @@ msgstr "" "Gir opp.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3356,125 +3326,125 @@ msgstr "" "Prøver pÃ¥ nytt.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ingen feilmelding" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Skjemaet %s støttes ikke" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Skjema mangler" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Ugyldig vertsnavn" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ugyldig portnummer" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ugyldig brukernavn" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Ufullstendig IPv6-adresse" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-adresser støttes ikke" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ugyldig IPv6-adresse" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS-støtte er ikke innebygget i denne versjonen" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Fant ufullstendig eller ugyldig multibyte-sekvens\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Klarte ikke Ã¥ tildele nok minne. Minnet er fullt.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Klarte ikke Ã¥ tildele %ld byte. Minnet er fullt.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: mellomlager for tekst er for stort (%d byte). Avbryter.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsetter i bakgrunnen med PID %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Klarte ikke Ã¥ fjerne lenke fra den symbolsk lenka %s. %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Klarte ikke Ã¥ starte libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Klarte ikke Ã¥ tolke IP-adresse «%s»\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Klarte ikke Ã¥ endre tillatelser til %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "%s er et ugyldig regulært uttrykk. %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Feil ved bruk av %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3561,6 +3531,24 @@ msgstr "" "Fant identisk oppføring i CDX-fil. Lagrer oppføring for tilbakesporing i " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: valget «--%s» tillater ikke bruk av argumenter\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: «--%s» er et ukjent valg\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: valget «-W %s» er flertydig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: valget «-W %s» tillater ikke bruk av argumenter\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: valget «-W %s» krever et argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Fila «%s» ligger der allerede, og blir ikke lastet ned igjen.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/nl.gmo b/po/nl.gmo index 1352952..432254a 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 02f2595..b28e91c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.16.3.124\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2015-09-23 11:42+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -24,7 +24,7 @@ msgstr "" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -32,7 +32,7 @@ msgstr "Onbekende systeemfout" msgid "Address family for hostname not supported" msgstr "Adresfamilie voor hostnaam wordt niet ondersteund" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Tijdelijk probleem in naamsherleiding" @@ -100,70 +100,45 @@ msgstr "Onderbroken door een signaal" msgid "Parameter string not correctly encoded" msgstr "Parametertekst is niet juist gecodeerd" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Onbekende fout" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: optie '%s' is niet eenduidig\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: optie '--%s' staat geen argument toe\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: onbekende optie '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: optie '%c%s' staat geen argument toe\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: optie '--%s' vereist een argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: onbekende optie '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: onbekende optie '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: optie '-W %s' is niet eenduidig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: optie '-W %s' staat geen argument toe\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: optie '-W %s' vereist een argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -183,13 +158,13 @@ msgstr "%s: optie '-W %s' vereist een argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "‘" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "’" @@ -262,28 +237,28 @@ msgstr "Reguliere expressie is te groot" msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Geen eerdere reguliere expressie" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "kan geen pijp aanmaken" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "subproces %s is mislukt" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle() is mislukt" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt" @@ -302,52 +277,52 @@ msgstr "subproces %s ontving het fatale signaal %d" msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: kan bindingsadres '%s' niet herleiden; binding wordt uitgeschakeld.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Verbinding maken met %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Verbinding maken met %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Verbinding maken met [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "verbonden.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "mislukt: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kan host-adres '%s' niet herleiden\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -381,174 +356,174 @@ msgstr "Kan '%s' niet verwijderen: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Kan geen reservekopie %2$s van %1$s maken: %3$s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Kan geen cookie verkrijgen voor %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaxfout in 'Set-Cookie'-kopregel: %s op positie %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Een cookie afkomstig van %s probeerde het domein in te stellen als " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Kan cookiesbestand '%s' niet openen: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Fout bij schrijven naar '%s': %s.\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Fout bij sluiten van '%s': %s.\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Niet-ondersteunde lijstsoort; Unix-lijstontleder wordt geprobeerd.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index van /%s op %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "tijd onbekend " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Bestand " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Map " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Koppeling " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Onzeker " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Lengte: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) resterend" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s resterend" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (onzeker)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Kan SSL niet initialiseren. Het wordt uitgeschakeld." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Inloggen als %s... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Fout in server-antwoord -- de besturingsverbinding wordt gesloten.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Fout in server-groet.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Schrijffout -- de besturingsverbinding wordt gesloten.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "De server weigert de login.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Login onjuist.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Ingelogd!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Server accepteerde de opdracht 'PBSZ 0' niet.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Server accepteerde de opdracht 'PROT %c' niet.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Serverfout -- kan systeemsoort niet bepalen.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "gereed. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "gereed.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Onbekend soort '%c' -- de besturingsverbinding wordt gesloten.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "gereed. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD is niet nodig.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "**Interne programmafout**: onmogelijk punt bereikt in getftp()." -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -559,7 +534,7 @@ msgstr "" "cwd_start = %d\n" "cwd_end = %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -568,37 +543,37 @@ msgstr "" "Map '%s' bestaat niet.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD is niet vereist.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Bestand is reeds opgehaald.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Kan geen PASV-transport starten.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Kan PASV-antwoord niet verwerken.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "Kan geen verbinding maken met %s op poort %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bindingsfout (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ongeldige PORT-opdracht.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -606,17 +581,17 @@ msgstr "" "\n" "REST-opdracht is mislukt; van voren af aan begonnen.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Bestand '%s' bestaat.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Bestand '%s' bestaat niet.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -625,7 +600,7 @@ msgstr "" "Bestand '%s' bestaat niet.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -634,40 +609,40 @@ msgstr "" "Bestand of map '%s' bestaat niet.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s is zojuist ontstaan.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s -- de besturingsverbinding wordt gesloten.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Gegevensverbinding: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Besturingsverbinding is gesloten.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Gegevensoverdracht is afgebroken.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(poging %2d) " -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -676,7 +651,7 @@ msgstr "" "%s (%s) - weggeschreven naar standaarduitvoer %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -685,35 +660,35 @@ msgstr "" "%s (%s) - '%s' opgeslagen [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Verwijderen van %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "'%s' wordt gebruikt als tijdelijk lijstbestand.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "'%s' is verwijderd.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Recursiediepte %d heeft maximum diepte %d overschreden.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Bestand op server is niet nieuwer dan lokaal bestand '%s' -- wordt niet " "opgehaald.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -722,7 +697,7 @@ msgstr "" "Bestand op server is nieuwer dan lokaal bestand '%s' -- ophalen.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -731,11 +706,11 @@ msgstr "" "De groottes komen niet overeen (is lokaal %s) -- ophalen.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ongeldige naam voor een symbolische koppeling, wordt overgeslagen.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -744,243 +719,243 @@ msgstr "" "Correcte symbolische koppeling bestaat al: %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Maken van symbolische koppeling: %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Symbolische koppelingen worden niet ondersteund; '%s' wordt overgeslagen.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Map '%s' wordt overgeslagen.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: onbekende of niet-ondersteunde bestandssoort.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Kan geen cookie verkrijgen voor %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: beschadigd tijdsstempel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Mappen worden niet opgehaald, want de diepte is %d (maximaal %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" "Er wordt niet afgedaald naar '%s', want deze is uitgesloten of niet " "ingesloten.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "'%s' wordt verworpen.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fout bij vergelijken van '%s' met '%s': %s.\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Geen overeenkomsten met patroon '%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Index is in HTML-vorm naar '%s' [%s] geschreven.\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Index is in HTML-vorm naar '%s' geschreven.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FOUT: Kan map %s niet openen.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA-certificaat '%s' is geladen\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "FOUT: Kan CRL-bestand '%s' niet laden: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL-bestand '%s' is geladen\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "FOUT: GnuTLS eist dat sleutel en certificaat van hetzelfde type zijn.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Rapporteer dit gebrek aan .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "FOUT" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "WAARSCHUWING" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Geen certificaat aangeboden door %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Het certificaat van '%s' wordt niet vertrouwd.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Het certificaat van '%s' heeft een onbekende uitgever.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Het certificaat van '%s' is herroepen.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: De certificaatondertekenaar van '%s' was geen CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Het certificaat van '%s' werd ondertekend met een onveilig algoritme.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Het certificaat van '%s' is nog niet geactiveerd.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Het certificaat van '%s' is verlopen.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fout tijdens initialiseren van X509-certificaat: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Geen certificaat gevonden\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fout tijdens ontleden van certificaat: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Het certificaat is nog niet geactiveerd\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Het certificaat is verlopen\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "De certificaateigenaar komt niet overeen met hostnaam '%s'\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Het certificaat moet een X.509 zijn.\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Fout bij verwerken van adressenlijst.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Onbekende host" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Herleiden van %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "mislukt: geen IPv4/IPv6-adressen gevonden voor de host.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "mislukt: wachttijd is verstreken.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Kan doel van onvolledige hyperlink %s niet bepalen.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ongeldige URL '%s': %s.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Schrijven van HTTP-verzoek is mislukt: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Geen kopregels aanwezig; HTTP/0.9 aangenomen." -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -989,66 +964,66 @@ msgstr "" "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" "Functie gmtime() is mislukt. Dit is waarschijnlijk een programmafout.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY-gegevensbestand '%s' ontbreekt: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Verbinding met [%s]:%d wordt hergebruikt.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Verbinding met %s:%d wordt hergebruikt.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Lezen van proxy-antwoord is mislukt: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Fout %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Onjuiste statusregel" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Het tunnelen door een proxy is mislukt: %s." -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Onbekend aanmeldingsschema.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Geselecteerde authenticatie: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Wordt opgeslagen als: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1057,72 +1032,72 @@ msgstr "" "Bij downloaden van ondertekening:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Kan inhoud van ondertekening niet lezen uit tijdelijk bestand. " "Overgeslagen.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Kan geen tijdelijk bestand aanmaken. Downloaden van ondertekening wordt " "overgeslagen.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Wegens fouten wordt SSL uitgeschakeld.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-verzoek is verzonden; wachten op antwoord... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Geen gegevens ontvangen.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Leesfout (%s) in kopregels.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(geen omschrijving)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Locatie: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "niet-opgegeven" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [volgen...]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1130,7 +1105,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1140,82 +1115,82 @@ msgstr "" " Het bestand is reeds volledig opgehaald; er is niets te doen.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Lengte: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "genegeerd" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Waarschuwing: jokertekens zijn bij HTTP niet mogelijk.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spider-modus: controleren of bestand bestaat op server.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan niet naar '%s' schrijven (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Vereiste eigenschap ontbreekt in ontvangen kopregels.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Authenticatie met gebruikersnaam/wachtwoord is mislukt.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Kan niet naar WARC-bestand schrijven.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan niet naar tijdelijk WARC-bestand schrijven.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Kan geen SSL-verbinding maken.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan %s niet verwijderen (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Fout: doorverwijzing (%d) zonder locatie.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Bestand bestaat niet op server -- verbroken hyperlink!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "'Last-modified'-kopregel ontbreekt -- tijdsstempels worden uitgeschakeld.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "'Last-modified'-kopregel is ongeldig -- tijdsstempel wordt genegeerd.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1225,16 +1200,16 @@ msgstr "" "opgehaald.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "De groottes komen niet overeen (is lokaal %s) -- ophalen.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Bestand op server is nieuwer -- ophalen.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1243,7 +1218,7 @@ msgstr "" "Bestand bestaat op server en zou hyperlinks kunnen bevatten -- ophalen.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1251,7 +1226,7 @@ msgstr "" "Bestand bestaat op server maar bevat geen hyperlinks -- wordt niet " "opgehaald.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1260,7 +1235,7 @@ msgstr "" "Bestand bestaat op server en zou verdere hyperlinks kunnen bevatten,\n" "maar recursie is uitgeschakeld -- wordt niet opgehaald.\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1268,12 +1243,12 @@ msgstr "" "Bestand bestaat op server.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1282,7 +1257,7 @@ msgstr "" "%s (%s) - geschreven naar standaarduitvoer %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1291,58 +1266,58 @@ msgstr "" "%s (%s) - '%s' opgeslagen [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Verbinding werd verbroken bij byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Leesfout bij byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Leesfout bij byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Niet-ondersteunde beschermingskwaliteit '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Niet-ondersteund algoritme '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: De variabele WGETRC wijst naar %s, maar deze bestaat niet.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan '%s' niet lezen (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fout in %s op regel %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaxfout in %s op regel %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Onbekende opdracht '%s' in %s op regel %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1353,7 +1328,7 @@ msgstr "" "Controleer de inhoud van '%s',\n" "of geef een ander bestand op met '--config'.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1364,76 +1339,76 @@ msgstr "" "Controleer de inhoud van '%s',\n" "of geef een ander bestand op met '--config'.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Waarschuwing: zowel de systeem- als gebruikers-wgetrc wijzen naar '%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Ongeldige opdracht '%s' bij '--execute'.\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ongeldige booleaan '%s' -- gebruik 'on' of 'off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Ongeldige booleaan '%s' -- gebruik 'on' of 'off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ongeldig aantal '%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s mag slechts één keer gebruikt worden\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ongeldige byte-waarde '%s'\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ongeldig tijdsinterval '%s'\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ongeldige waarde '%s'\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ongeldige kopregel '%s'\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ongeldige WARC-kopregel '%s'\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ongeldig voortgangstype '%s'.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1442,40 +1417,40 @@ msgstr "" "%s: %s: Ongeldige beperking '%s';\n" " gebruik [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Codering %s is niet geldig\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, fuzzy, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Omzetting van %s naar UTF-8 wordt niet ondersteund\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Incomplete of ongeldige multibyte-volgorde aangetroffen\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Onafgehandeld foutnummer %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8(): locale is niet ingesteld\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode() is mislukt (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Kan geen verbinding maken met %s op poort %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1484,17 +1459,17 @@ msgstr "" "\n" "%s ontvangen; uitvoer wordt omgeleid naar '%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; bijhouden van logboek wordt uitgeschakeld.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Gebruik: %s [OPTIE]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1502,67 +1477,67 @@ msgstr "" "(De argumenten bij lange opties gelden ook voor de korte vormen.)\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Opstarten:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version programmaversie tonen en stoppen\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help deze hulptekst tonen en stoppen\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background na opstarten naar de achtergrond gaan\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=OPDRACHT deze OPDRACHT (in '.wgetrc'-stijl) uitvoeren\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Logboek en invoerbestand:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=BESTAND meldingen opslaan in BESTAND\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=BESTAND meldingen toevoegen aan BESTAND\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug uitgebreide debuguitvoer tonen\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug 'Watt-32'-debuguitvoer tonen\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet stil zijn (geen uitvoer produceren)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose gedetailleerde uitvoer produceren " "(standaard)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose beknopte uitvoer (maar niet geheel stil)\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1570,13 +1545,13 @@ msgstr "" " --report-speed=TYPE bandbreedte tonen als TYPE; TYPE kan 'bits' " "zijn\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=BESTAND URL's uit dit BESTAND lezen\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1585,11 +1560,11 @@ msgstr "" " --metalink-file URL's uit lokaal of extern metalink bestand " "lezen\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html invoerbestand als HTML behandelen\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1597,25 +1572,25 @@ msgstr "" " -B, --base=URL koppelingen in HTML-invoerbestanden (-i -F)\n" " herleiden relatief tot URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=BESTAND te gebruiken configuratiebestand\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config geen configuratiebestand lezen\n" -#: src/main.c:620 +#: src/main.c:629 #, fuzzy msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " -o, --output-file=BESTAND meldingen opslaan in BESTAND\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Downloaden:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1623,20 +1598,20 @@ msgstr "" " -t, --tries=AANTAL maximaal dit AANTAL herhalingspogingen doen\n" " ('0' voor onbegrensd)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused ook bij geweigerde verbinding opnieuw " "proberen\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" " -O, --output-document=BSTND alle documenten naar dit ene BSTND " "schrijven\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1644,14 +1619,14 @@ msgstr "" " -nc, --no-clobber downloads overslaan die bestaande bestanden\n" " zouden overschrijven\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config geen configuratiebestand lezen\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1659,7 +1634,7 @@ msgstr "" " -c, --continue voortzetten van gedeeltelijk opgehaald " "bestand\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1667,17 +1642,17 @@ msgstr "" " --start-pos=POSITIE downloaden starten vanaf deze POSITIE " "(0=begin)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYPE dit TYPE voortgangsmeter gebruiken\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress de voortgangsbalk tonen\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1687,7 +1662,7 @@ msgstr "" "nieuwer\n" " zijn dan lokale bestanden\n" -#: src/main.c:648 +#: src/main.c:657 #, fuzzy msgid "" " --no-if-modified-since don't use conditional if-modified-since " @@ -1698,7 +1673,7 @@ msgstr "" "kopiëren\n" " van die op de server\n" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1708,26 +1683,26 @@ msgstr "" "kopiëren\n" " van die op de server\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response antwoord van server tonen\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider niets ophalen, alleen kijken\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SECONDEN alle wachttijden instellen op SECONDEN\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1736,27 +1711,27 @@ msgstr "" " --bind-address=ADRES binden aan ADRES (hostnaam of IP) op " "localhost\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SECONDEN DNS-opzoekwachttijd instellen op SECONDEN\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SCNDN verbindingswachttijd instellen op SCNDN\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SECONDEN leeswachttijd instellen op SECONDEN\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SECONDEN tussen bestanden dit aantal SECONDEN " "wachten\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1764,7 +1739,7 @@ msgstr "" " --waitretry=SECONDEN 1..SECONDEN wachten tussen herhaalde " "pogingen\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1772,17 +1747,17 @@ msgstr "" " --random-wait tussen bestanden 0,5..1,5 keer gewone tijd " "wachten\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy geen proxy gebruiken\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=AANTAL downloadquotum is AANTAL (Kilo- of " "Megabytes)\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1790,18 +1765,18 @@ msgstr "" " --bind-address=ADRES binden aan ADRES (hostnaam of IP) op " "localhost\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=SNELHEID downloaden tot deze SNELHEID (bytes/s) " "begrenzen\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache bufferen van DNS-zoekacties uitschakelen\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1809,7 +1784,7 @@ msgstr "" " --restrict-file-names=OS tekens in bestandsnamen beperken tot die\n" " welke besturingssysteem OS toestaat\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1818,15 +1793,15 @@ msgstr "" "negeren\n" " bij vergelijken van bestands- en mapnamen\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only alleen met IPv4-adressen verbinden\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only alleen met IPv6-adressen verbinden\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1835,20 +1810,20 @@ msgstr "" " --prefer-family=SOORT eerst met deze SOORT adressen verbinden\n" " ('IPv6', 'IPv4', of 'none')\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=GEBRUIKER de GEBRUIKER voor FTP en HTTP\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=WACHTWOORD het WACHTWOORD voor FTP en HTTP\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password vragen om wachtwoorden\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1859,111 +1834,108 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI-ondersteuning uitschakelen\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=SET deze tekenset gebruiken voor lokale IRI's\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=SET standaard deze gindse tekenset gebruiken\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink bestand verwijderen alvorens te " "overschrijven\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=AANTAL downloadquotum is AANTAL (Kilo- of " -"Megabytes)\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-glob bestandsnaam-'globbing' uitschakelen\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Mappen:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories geen mappen aanmaken\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories aanmaken van mappen afdwingen\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories geen host-mappen maken\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories in mappen het gegeven protocol gebruiken\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PAD bestanden opslaan in de map PAD/...\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=AANTAL dit AANTAL padcomponenten op server negeren\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-opties:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=GEBRUIKER de GEBRUIKER voor HTTP\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=WACHTWRD het WACHTWRD voor HTTP\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache server-gebufferde data niet toestaan\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1971,7 +1943,7 @@ msgstr "" " --default-page=NAAM de standaardpaginanaam aanpassen\n" " (normaliter is dit 'index.html')\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1980,38 +1952,38 @@ msgstr "" "passende\n" " extensies\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length de 'Content-Length'-kopregel negeren\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=TEKENREEKS deze TEKENREEKS tussen kopregels invoegen\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYPE dit TYPE voortgangsmeter gebruiken\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximum aantal doorverwijzingen per pagina\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=GEBRUIKER de GEBRUIKER voor de proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=WACHTWRD het WACHTWRD voor de proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2019,11 +1991,11 @@ msgstr "" " --referer=URL een 'Referer'-kopregel met deze URL " "gebruiken\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP-kopregels in bestand opslaan\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2031,29 +2003,29 @@ msgstr "" " -U, --user-agent=AGENT als AGENT identificeren, niet als Wget/" "VERSIE\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr " --no-http-keep-alive geen HTTP-'keep-alive' gebruiken\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies geen cookies gebruiken\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=BESTAND cookies voor de sessie uit dit BESTAND " "laden\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=BESTAND cookies na de sessie in dit BESTAND opslaan\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2061,27 +2033,27 @@ msgstr "" " --keep-session-cookies de (tijdelijke) sessiecookies laden en " "opslaan\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=TEKENREEKS deze TEKENREEKS met POST-methode verzenden\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=BESTAND dit BESTAND met POST-methode verzenden\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTP-METHODE deze HTTP-METHODE in de kopregels gebruiken\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2089,7 +2061,7 @@ msgstr "" " --body-file=TEKST deze TEKST als gegevens verzenden;\n" " optie '--method' moet gegeven zijn\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2097,7 +2069,7 @@ msgstr "" " --body-file=BESTAND inhoud van dit BESTAND verzenden;\n" " optie '--method' moet gegeven zijn\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2109,7 +2081,7 @@ msgstr "" " keuze van lokale bestandsnamen " "[EXPERIMENTEEL]\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2117,7 +2089,7 @@ msgstr "" " --content-on-error bij serverfouten de ontvangen berichten " "tonen\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2129,11 +2101,11 @@ msgstr "" " zonder te wachten op de vraag van de " "server\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-opties (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2144,52 +2116,52 @@ msgstr "" " ('auto', 'SSLv2', 'SSLv3', 'TLSv1', of " "'PFS')\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only alleen veilige (HTTPS) hyperlinks volgen\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate servercertificaat niet controleren\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=BESTAND BESTAND dat cliëntcertificaat bevat\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE TYPE van cliëntcertificaat ('PEM' of 'DER')\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=BESTAND BESTAND dat de privésleutels bevat\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYPE TYPE van privésleutel ('PEM' of 'DER')\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=BESTND BESTND dat een bundel van CA's bevat\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=MAP MAP waar hash-lijst van CA's opgeslagen is\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=BESTAND BESTAND dat een bundel van CRL's bevat\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2199,29 +2171,29 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=BESTAND BESTAND met ruis om de SSL-PRNG te 'seeden'\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=BESTAND BESTAND met naam van de EGD-socket\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS-opties:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache server-gebufferde data niet toestaan\n" -#: src/main.c:861 +#: src/main.c:870 #, fuzzy msgid "" " --hsts-file path of HSTS database (will override " @@ -2230,11 +2202,11 @@ msgstr "" " -v, --verbose gedetailleerde uitvoer produceren " "(standaard)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-opties:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2242,36 +2214,36 @@ msgstr "" " --ftp-stmlf Stream_LF gebruiken voor alle binaire\n" " FTP-bestanden\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=GEBRUIKER de GEBRUIKER voor FTP\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=WACHTWRD het WACHTWRD voor FTP\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing '.listing'-bestanden niet verwijderen\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob bestandsnaam-'globbing' uitschakelen\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp niet de \"passieve\" overdrachtsmodus " "gebruiken\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions toegangsrechten overnemen van ginds bestand\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2279,11 +2251,11 @@ msgstr "" " --retr-symlinks symbolisch-gekoppelde bestanden ook ophalen\n" " (bij recursie), maar geen mappen\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS-opties:\n" -#: src/main.c:891 +#: src/main.c:900 #, fuzzy msgid "" " --ftps-implicit use implicit FTPS (default port is " @@ -2292,7 +2264,7 @@ msgstr "" " --ftp-stmlf Stream_LF gebruiken voor alle binaire\n" " FTP-bestanden\n" -#: src/main.c:893 +#: src/main.c:902 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2302,23 +2274,23 @@ msgstr "" " --trust-server-names de naam uit de doorverwijzings-URL " "gebruiken\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC-opties:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2326,41 +2298,41 @@ msgstr "" " --warc-file=BESTANDSNAAM verzoeks- en responsgegevens hierin " "opslaan\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=TEKENREEKS deze TEKENREEKS invoegen in warcinfo-" "record\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " --warc-max-size=GROOTTE maximum grootte van WARC-bestanden\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX-indexbestanden aanmaken\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" " --warc-dedup=BESTANDSNAAM records in dit indexbestand niet opslaan\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression WARC-bestanden niet comprimeren met " "'gzip'\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests geen SHA1-controlesommen berekenen\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2368,7 +2340,7 @@ msgstr "" " --no-warc-keep-log logbestand niet opslaan in een WARC-" "record\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2376,28 +2348,28 @@ msgid "" msgstr "" " --warc-tempdir=MAP plaats voor tijdelijke WARC-bestanden\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Recursief downloaden:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive recursief downloaden\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" " -l, --level=AANTAL maximale recursiediepte ('0' voor onbegrensd)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after bestanden na downloaden lokaal wissen\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2407,13 +2379,13 @@ msgstr "" "bestanden\n" " naar lokale bestanden laten wijzen\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2421,7 +2393,7 @@ msgstr "" " --backups=AANTAL alvorens een bestand te schrijven, maximaal dit\n" " aantal reservekopie-bestanden roteren\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2430,7 +2402,7 @@ msgstr "" "XX\n" " te converteren\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2439,7 +2411,7 @@ msgstr "" "XX\n" " te converteren\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2447,7 +2419,7 @@ msgstr "" " -m, --mirror gelijk aan '-r -N -l inf --no-remove-listing' " "samen\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2455,98 +2427,98 @@ msgstr "" " -p, --page-requisites alle plaatjes enzovoort voor HTML-weergave " "ophalen\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" " --strict-comments HTML-commentaar strikt volgens SGML afhandelen\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" "Recursief accepteren/weigeren (de LIJSTen zijn kommagescheiden " "opsommingen):\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=LIJST geaccepteerde achtervoegsels\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LIJST geweigerde achtervoegsels\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEXP reguliere expressie voor te accepteren " "URL's\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEXP reguliere expressie voor te negeren URL's\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYPE het type van de reguliere expressie (posix|" "pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=TYPE het type van de reguliere expressie (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=LIJST geaccepteerde domeinen\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=LIJST geweigerde domeinen\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp FTP-hyperlinks in HTML-documenten " "volgen\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=LIJST deze HTML-tags volgen\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=LIJST deze HTML-tags negeren\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts ook naar andere servers gaan (bij " "recursie)\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative alleen relatieve hyperlinks volgen\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LIJST geaccepteerde mappen\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2555,24 +2527,24 @@ msgstr "" " --trust-server-names de naam uit de doorverwijzings-URL " "gebruiken\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIJST uitgesloten mappen\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent hogergelegen mappen negeren\n" # FIXME: add period -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Rapporteer gebreken in het programma (of suggesties) aan ;\n" "meld fouten in de vertaling aan .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" @@ -2582,63 +2554,63 @@ msgstr "" "netwerk.\n" "\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Wachtwoord voor gebruiker %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Wachtwoord: " -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "kan geen pijp aanmaken" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Wachtwoord voor gebruiker %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Locale: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Gecompileerd: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Gelinkt: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2647,29 +2619,29 @@ msgstr "" "GNU Wget %s gecompileerd op %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (user)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2683,7 +2655,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2691,41 +2663,41 @@ msgstr "" "\n" "Oorspronkelijk geschreven door Hrvoje NikÅ¡ić .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Rapporteer gebreken in het programma (of suggesties) aan ;\n" "meld fouten in de vertaling aan .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Onvoldoende geheugen beschikbaar\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Gestopt wegens fout in %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Typ '%s --help' voor meer opties.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ongeldige optie -- '-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Ondersteuning voor debuggen is niet meegecompileerd. Optie '--debug' wordt " "genegeerd.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2734,7 +2706,7 @@ msgstr "" "Zowel '--no-clobber' als '--convert-links' werden opgegeven; alleen '--" "convert-links' wordt gebruikt.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, fuzzy, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2743,23 +2715,23 @@ msgstr "" "Zowel '--no-clobber' als '--convert-links' werden opgegeven; alleen '--" "convert-links' wordt gebruikt.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Kan niet gelijktijdig 'details geven' en 'stil zijn'.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Tijdsstempels en het niet-overschrijven van oude bestanden gaan niet samen.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Opties '--inet4-only' en '--inet6-only' gaan niet samen.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2770,7 +2742,7 @@ msgstr "" "Opties '-k' en '-O' gaan niet samen als er meerdere URL's gegeven zijn,\n" "of als ook '-p' of '-r' gegeven is. Zie de handleiding voor details.\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2780,7 +2752,7 @@ msgstr "" "wat opgehaald wordt in het ene opgegeven bestand geplaatst wordt.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2790,12 +2762,7 @@ msgstr "" "O'.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2803,7 +2770,7 @@ msgstr "" "WARC-uitvoer werkt niet met '--no-clobber'; '--no-clobber' wordt " "uitgeschakeld.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2811,12 +2778,12 @@ msgstr "" "WARC-uitvoer werkt niet met tijdsstempels; tijdsstempels worden " "uitgeschakeld.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-uitvoer werkt niet met '--spider'.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2825,7 +2792,7 @@ msgstr "" "WARC-uitvoer werkt niet met '--continue' of '--start-pos'; deze worden " "uitgeschakeld.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2833,7 +2800,7 @@ msgstr "" "Controlesommen zijn uitgeschakeld; WARC-ontdubbeling zal geen dubbele " "records vinden.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2842,12 +2809,12 @@ msgstr "" "WARC-uitvoer werkt niet met '--continue' of '--start-pos'; deze worden " "uitgeschakeld.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Opties '--ask-password' en '--password' gaan niet samen.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2856,17 +2823,17 @@ msgstr "" "Opties '--start-pos' en '--continue' samen wordt ontraden; '--continue' " "wordt uitgeschakeld.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: ontbrekende URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Opties '--post-data' en '--post-file' gaan niet samen.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, fuzzy, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2876,7 +2843,7 @@ msgstr "" "optie '--method' verwacht gegevens via de opties '--body-data' of '--body-" "file'." -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2885,17 +2852,17 @@ msgstr "" "U dient via '--method=HTTP-METHODE' een methode op te geven om te gebruiken " "met '--body-data' of '--body-file'.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Opties '--body-data' en '--body-file' gaan niet samen.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Deze versie heeft geen ondersteuning voor IRI's.\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2903,7 +2870,7 @@ msgstr "" "Optie '-k' of '-r' gaat alleen samen met '-O' bij uitvoer naar een normaal " "bestand.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2912,42 +2879,42 @@ msgstr "" "Optie '-k' of '-r' gaat alleen samen met '-O' bij uitvoer naar een normaal " "bestand.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: kan host-adres '%s' niet herleiden\n" -#: src/main.c:2008 +#: src/main.c:2017 #, fuzzy, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Geen URL's gevonden in %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kan '%s' niet verwijderen: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Kan niet alle hulpbronnen van %s downloaden.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2958,7 +2925,7 @@ msgstr "" "Totaal verlopen tijd: %s\n" "Opgehaald: %d bestanden, %s in %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Downloadquotum van %s bytes is overschreden!\n" @@ -3121,109 +3088,109 @@ msgstr "Bestand %s is opgehaald maar ondertekening komt niet overeen. \n" msgid "Renaming %s to %s.\n" msgstr "Verwijderen van %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Voortzetting in de achtergrond.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Voortzetting in de achtergrond, proces-ID %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Uitvoer wordt naar '%s' geschreven.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() is mislukt\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() is mislukt\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Kan geen bruikbaar socket-stuurprogramma vinden.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "ioctl() is mislukt -- de socket kon niet op 'blokkerend' gezet worden\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: waarschuwing: '%s'-sleutelwoord aangetroffen vóór een " "machinenaam\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: onbekend sleutelwoord '%s'\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Gebruik: %s NETRC [HOSTNAAM]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan status van %s niet opvragen: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" "WAARSCHUWING: er wordt een zwakke 'seed' voor de toevalsgenerator gebruikt.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Kan geen 'seed' voor PRNG vinden; gebruik eventueel '--random-file'.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Uw OpenSSL-versie is te oud om TLSv1.1 te ondersteunen.\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Uw OpenSSL-versie is te oud om TLSv1.2 te ondersteunen.\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: niet-geïmplementeerde 'secure-protocol'-optiewaarde %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: kan certificaat van %s (uitgegeven door %s) niet controleren:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Kan de autoriteit van de uitgever niet lokaal verifiëren.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Zelf-ondertekend certificaat gevonden.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Certificaat is nog niet geldig.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Certificaat is verlopen.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3232,7 +3199,7 @@ msgstr "" "%s: geen van de alternatieve namen in het certificaat komt\n" " overeen met de gevraagde hostnaam '%s'.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3240,7 +3207,7 @@ msgstr "" " %s: naam '%s' in certificaat komt niet overeen met gevraagde hostnaam " "'%s'.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3251,14 +3218,14 @@ msgstr "" " Dit zou erop kunnen wijzen dat de host niet is wie die zegt te zijn\n" " (oftewel dat het niet de echte '%s' is).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Gebruik '--no-check-certificate' om een onbeveiligde verbinding met %s te " "maken.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3267,7 +3234,7 @@ msgstr "" "\n" "%*s[ %sK wordt overgeslagen ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Ongeldige puntjesstijl '%s' opgegeven; blijft onveranderd.\n" @@ -3275,22 +3242,22 @@ msgstr "Ongeldige puntjesstijl '%s' opgegeven; blijft onveranderd.\n" # FIXME: this is not "ETA" but simply "still %s" or "%s remaining" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " nog %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " in " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Kan frequentie van de klok niet bepalen: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "'%s' wordt verwijderd omdat het verworpen dient te worden.\n" @@ -3304,22 +3271,22 @@ msgstr "Kan %s niet openen: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Laden van 'robots.txt'; fouten kunnen worden genegeerd.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fout tijdens ontleden van proxy-URL '%s': %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fout in proxy-URL '%s': moet HTTP zijn.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Maximum van %d doorverwijzingen is overschreden.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3327,7 +3294,7 @@ msgstr "" "Pogingen worden gestaakt.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3335,128 +3302,128 @@ msgstr "" "Nieuwe poging.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Geen fout" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Niet-ondersteund schema '%s'" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schema ontbreekt" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Ongeldige hostnaam" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ongeldig poortnummer" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ongeldige gebruikersnaam" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Onafgesloten numeriek IPv6-adres" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-adressen worden niet ondersteund" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ongeldig numeriek IPv6-adres" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Ondersteuning voor HTTPS is niet meegecompileerd" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Incomplete of ongeldige multibyte-volgorde aangetroffen\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Kan niet genoeg geheugen reserveren; onvoldoende beschikbaar.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" "%s: %s: Kan geen %ld bytes reserveren; onvoldoende geheugen beschikbaar.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf(): tekstbuffer is te groot (%d bytes) -- proces is afgebroken.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Voortzetting in de achtergrond, proces-ID %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" +msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Kan geen cookie verkrijgen voor %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Kan geen cookie verkrijgen voor %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: kan host-adres '%s' niet herleiden\n" +msgstr "FOUT: Kan certificaat %s niet openen: (%d).\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Kan geen cookie verkrijgen voor %s\n" +msgstr "Verwijderen van symbolische koppeling '%s' is mislukt: %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ongeldige reguliere expressie %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fout tijdens zoeken naar %s: %d.\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3541,6 +3508,37 @@ msgstr "" "Exacte overeenkomst gevonden in CDX-bestand. Opslaan van herbezoek-record in " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: optie '--%s' staat geen argument toe\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: onbekende optie '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: optie '-W %s' is niet eenduidig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: optie '-W %s' staat geen argument toe\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: optie '-W %s' vereist een argument\n" + +#~ msgid "Invalid UTF-8 sequence: %s\n" +#~ msgstr "Ongeldige UTF-8-reeks: %s\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "idn_decode() is mislukt (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s ontvangen.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Bestand '%s' is reeds aanwezig -- wordt niet opgehaald.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3561,19 +3559,6 @@ msgstr "" #~ "%d verbroken hyperlinks gevonden.\n" #~ "\n" -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "Ongeldige UTF-8-reeks: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "idn_decode() is mislukt (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s ontvangen.\n" - #~ msgid "Authorization failed.\n" #~ msgstr "Aanmelding is mislukt.\n" diff --git a/po/pl.gmo b/po/pl.gmo index 34dccb4..6dc162c 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 0e3b173..c85fcdd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-19 17:45+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -25,7 +25,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nieznany bÅ‚Ä…d systemowy" @@ -33,7 +33,7 @@ msgstr "Nieznany bÅ‚Ä…d systemowy" msgid "Address family for hostname not supported" msgstr "Rodzina adresów dla podanej nazwy hosta nie jest obsÅ‚ugiwana" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Tymczasowy bÅ‚Ä…d rozwiÄ…zywania nazw" @@ -101,70 +101,45 @@ msgstr "Przerwane przez sygnaÅ‚" msgid "Parameter string not correctly encoded" msgstr "ÅaÅ„cuch parametru niepoprawnie zakodowany" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Nieznany bÅ‚Ä…d" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcja '%s' jest niejednoznaczna; możliwoÅ›ci:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcja '%s' jest niejednoznaczna\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcja '--%s' nie może mieć argumentów\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opcja '%s' jest niejednoznaczna; możliwoÅ›ci:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nieznana opcja '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcja '%c%s' nie może mieć argumentów\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcja '--%s' musi mieć argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nieznana opcja '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nieznana opcja '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: bÅ‚Ä™dna opcja -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcja musi mieć argument -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcja '-W %s' nie może mieć argumentów\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcja ' -W %s' musi mieć argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -184,13 +159,13 @@ msgstr "%s: opcja ' -W %s' musi mieć argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -262,28 +237,28 @@ msgstr "Wyrażenie regularne zbyt duże" msgid "Unmatched ) or \\)" msgstr "Niesparowane ) lub \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Brak poprzedniego wyrażenia regularnego" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "nie można utworzyć potoku" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "podproces %s zawiódÅ‚" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle nie powiodÅ‚o siÄ™" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "nie można odtworzyć fd %d: dup2 nie powiodÅ‚o siÄ™" @@ -302,51 +277,51 @@ msgstr "podproces %s dostaÅ‚ krytyczny sygnaÅ‚ %d" msgid "memory exhausted" msgstr "pamięć wyczerpana" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: nie można rozwiÄ…zać adresu bind `%s': wyÅ‚Ä…czenie bind.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "ÅÄ…czenie siÄ™ z %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "ÅÄ…czenie siÄ™ z %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "ÅÄ…czenie siÄ™ z [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF nie powiodÅ‚o siÄ™: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "poÅ‚Ä…czono.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "nieudane: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nie udaÅ‚o siÄ™ rozwiÄ…zać adresu hosta %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR nie powiodÅ‚o siÄ™: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -381,175 +356,175 @@ msgstr "Nie udaÅ‚o siÄ™ usunąć %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Nie można stworzyć kopii zapasowej %s jako %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Nie udaÅ‚o siÄ™ uzyskać ciasteczka dla %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "BÅ‚Ä…d skÅ‚adni w Set-Cookie: %s na pozycji %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Ciasteczko pochodzÄ…ce z %s próbowaÅ‚o ustawić domenÄ™ na " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Nie można otworzyć pliku ciasteczek %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "BÅ‚Ä…d podczas zapisu do %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "BÅ‚Ä…d podczas zamykania %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "NieobsÅ‚ugiwany typ listy plików, próbowanie analizatora list Uniksowych.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Indeks /%s na %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "czas nieznany " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Plik " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Katalog " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "OdnoÅ›nik " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Nie pewny " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtów)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "DÅ‚ugość: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) pozostaÅ‚o" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s pozostaÅ‚o" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (nie autorytatywne)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Nie udaÅ‚o siÄ™ zainicjować SSL. Zostanie wyÅ‚Ä…czony." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Logowanie siÄ™ jako %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "BÅ‚Ä…d w odpowiedzi serwera, zamykanie poÅ‚Ä…czenia sterujÄ…cego.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "BÅ‚Ä…d w powitaniu serwera.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Niepowodzenie podczas zapisu, zamykanie poÅ‚Ä…czenia sterujÄ…cego.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Serwer nie pozwala na zalogowanie siÄ™.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "NieprawidÅ‚owy login lub hasÅ‚o.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Zalogowano siÄ™!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Serwer nie przyjÄ…Å‚ polecenia 'PBSZ 0'.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Serwer nie przyjÄ…Å‚ polecenia 'PROT %c'.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "BÅ‚Ä…d serwera, nie można ustalić typu systemu.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "zrobiono. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "zrobiono.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Nieznany typ `%c', zamykanie poÅ‚Ä…czenia sterujÄ…cego.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "zrobiono. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nie jest potrzebne.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "OsiÄ…gniÄ™to logicznie niemożliwy warunek w getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -560,7 +535,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -569,37 +544,37 @@ msgstr "" "Nie ma katalogu %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nie wymagane.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Plik zostaÅ‚ już pobrany.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nie można zainicjować przesyÅ‚ania typu PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Nie można przeanalizować skÅ‚adni odpowiedzi PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "nie udaÅ‚o siÄ™ poÅ‚Ä…czyć z %s:%d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "BÅ‚Ä…d Bind (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "NieprawidÅ‚owe PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -607,17 +582,17 @@ msgstr "" "\n" "REST nieudane, rozpoczynanie od poczÄ…tku.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Plik %s istnieje.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Brak pliku %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -626,7 +601,7 @@ msgstr "" "Nie ma pliku %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -635,40 +610,40 @@ msgstr "" "Nie ma pliku ani katalogu %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s zaczÄ…Å‚ istnieć.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, zamykanie poÅ‚Ä…czenia sterujÄ…cego.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - PoÅ‚Ä…czenie danych: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "ZamkniÄ™to poÅ‚Ä…czenie sterujÄ…ce.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Przerwano przesyÅ‚anie danych.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Plik %s już istnieje, bez pobierania.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(próba:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -677,7 +652,7 @@ msgstr "" "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -686,34 +661,34 @@ msgstr "" "%s (%s) - zapisano %s [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Usuwanie %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Użycie %s jako tymczasowego pliku dla listy.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "UsuniÄ™to %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "GÅ‚Ä™bokość rekurencji %d przekroczyÅ‚a maksymalnÄ… gÅ‚Ä™bokość %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Plik po stronie serwera nie jest nowszy niż lokalny %s -- bez pobierania.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -722,7 +697,7 @@ msgstr "" "Plik po stronie serwera jest nowszy niż lokalny %s -- pobieranie.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -731,11 +706,11 @@ msgstr "" "Rozmiary siÄ™ różniÄ… (lokalny %s) -- pobieranie.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "NieprawidÅ‚owa nazwa dowiÄ…zania symbolicznego, pomijanie.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -744,240 +719,240 @@ msgstr "" "Już istnieje poprawne dowiÄ…zanie symboliczne %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Tworzenie dowiÄ…zania symbolicznego %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "DowiÄ…zania symboliczne nie sÄ… obsÅ‚ugiwane, pomijanie dowiÄ…zania %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Pomijanie katalogu %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: nieznany/nieobsÅ‚ugiwany typ pliku.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: znacznik czasowy uszkodzony.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Nie bÄ™dÄ… pobierane katalogi, gdyż gÅ‚Ä™bokość wynosi %d (maks. %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Bez wchodzenia do %s, ponieważ jest on wyÅ‚Ä…czony/nie-wÅ‚Ä…czony.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Odrzucanie %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "BÅ‚Ä…d podczas dopasowywania %s wzglÄ™dem %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Brak pasujÄ…cych do wzorca %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Zapisano indeks w postaci HTML-a w %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Zapisano indeks w postaci HTML-a w %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "BÅÄ„D: Nie można otworzyć katalogu %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "BÅÄ„D: Nie udaÅ‚o siÄ™ otworzyć certyfikatu %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "ZaÅ‚adowano certyfikat CA '%s'\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "BÅÄ„D: Nie udaÅ‚o siÄ™ zaÅ‚adować pliku CRL '%s': (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "ZaÅ‚adowano plik CRL '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "BÅÄ„D: GnuTLS wymaga, aby klucz i certyfikat byÅ‚y tego samego typu.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Prosimy o zgÅ‚oszenie tego bÅ‚Ä™du na adres bug-wget@gnu.org.\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "BÅÄ„D" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "UWAGA" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Å»aden certyfikat nie zostaÅ‚ przedstawiony przez %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Å»aden certyfikat nie zostaÅ‚ przedstawiony przez %s.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certyfikat %s nie ma znanego wystawcy.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certyfikat %s zostaÅ‚ unieważniony.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: PodpisujÄ…cy certyfikat %s nie byÅ‚ CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Certyfikat %s zostaÅ‚ podpisany algorytmem, który nie jest bezpieczny.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certyfikat %s nie jest jeszcze aktywny.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certyfikat %s wygasÅ‚.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "BÅ‚Ä…d inicjalizacji certyfikatu X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Nie znaleziono certyfikatu\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "BÅ‚Ä…d podczas analizy certyfikatu: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certyfikat nie zostaÅ‚ jeszcze aktywowany.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certyfikat wygasÅ‚.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "WÅ‚aÅ›ciciel certyfikatu nie pasuje do nazwy hosta %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Klucz publiczny nie pasuje do przypiÄ™tego klucza publicznego!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certyfikat musi być w formacie X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "BÅ‚Ä…d w obsÅ‚udze listy adresów.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Nieznany host" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Translacja %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "bÅ‚Ä…d: brak adresu IPv4/IPv6 dla hosta.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "bÅ‚Ä…d: przekroczono limit czasu oczekiwania.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Nie udaÅ‚o siÄ™ przeanalizować niedokoÅ„czonego Å‚Ä…cza %s.\n" # c-format -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: NieprawidÅ‚owy URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Nie powiodÅ‚o siÄ™ wysyÅ‚anie żądania HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Brak nagłówków, przyjÄ™to HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -986,11 +961,11 @@ msgstr "" "Plik %s już istnieje, bez pobierania.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime nie powiodÅ‚o siÄ™. To prawdopodobnie bÅ‚Ä…d.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -998,55 +973,55 @@ msgstr "" "Nie można przeksztaÅ‚cić znacznika czasu na format http. Degradacja do czasu " "0 jako czasu ostatniej modyfikacji.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Brak pliku danych BODY %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ponowne użycie poÅ‚Ä…czenia do [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ponowne użycie poÅ‚Ä…czenia do %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Nie powiodÅ‚o siÄ™ odczytanie odpowiedzi proxy: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s BÅÄ„D %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Źle sformuÅ‚owana linia statusu" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelowanie proxy nie powiodÅ‚o siÄ™: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Nieznana metoda uwierzytelniania.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Wybrano uwierzytelnienie: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Zapis do: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1055,22 +1030,22 @@ msgstr "" "Podczas pobierania podpisu:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Nie udaÅ‚o siÄ™ odczytać treÅ›ci podpisu z pliku tymczasowego. PominiÄ™to.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Nie udaÅ‚o siÄ™ utworzyć pliku tymczasowego. PominiÄ™to pobieranie podpisu.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "NieprawidÅ‚owa wartość pri. Domniemano %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1078,42 +1053,42 @@ msgstr "" "Nie udaÅ‚o siÄ™ odnaleźć akceptowalnego skrótu dla zasobów Metalink.\n" "Zignorowano je.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "WyÅ‚Ä…czenie SSL ze wzglÄ™du na napotkane bÅ‚Ä™dy\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Żądanie %s wysÅ‚ano, oczekiwanie na odpowiedź... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Brak danych w odpowiedzi.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "BÅ‚Ä…d odczytu (%s) w nagłówkach.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(brak opisu)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Lokalizacja: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nieznana" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [podążanie]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1122,7 +1097,7 @@ msgstr "" "Plik %s nie zostaÅ‚ zmodyfikowany na serwerze. PominiÄ™to pobranie.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1133,7 +1108,7 @@ msgstr "" "Może warto dodać opcjÄ™ --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1143,58 +1118,58 @@ msgstr "" " Plik już zostaÅ‚ w peÅ‚ni pobrany; nic do roboty.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "DÅ‚ugość: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "zignorowano" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Ostrzeżenie: znaki globalne nie sÄ… obsÅ‚ugiwane w HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Tryb spider wÅ‚Ä…czony. Sprawdź czy zdalny plik istnieje.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie można zapisać do %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "W odebranym nagłówku brak wymaganego atrybutu.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Uwierzytelnienie użytkownik/hasÅ‚o nie powiodÅ‚o siÄ™.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Nie można zapisać do pliku WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Nie można zapisać do tymczasowego pliku WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Niemożliwe utworzenie poÅ‚Ä…czenia SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie można usunąć %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "BÅÄ„D: Przekierowanie (%d) bez lokalizacji.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1202,23 +1177,23 @@ msgstr "" "Nie udaÅ‚o siÄ™ odnaleźć danych Metalink w odpowiedzi HTTP. Pobieranie pliku " "przy użyciu HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Napotkano nagłówek Metalink. PrzeÅ‚Ä…czanie w tryb Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Zdalny plik nie istnieje -- zepsuty odnoÅ›nik!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Brak nagłówka Last-modified -- znaczniki czasu wyÅ‚Ä…czone.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "BÅ‚Ä™dny nagłówek Last-modified -- znacznik czasu zignorowany.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1227,16 +1202,16 @@ msgstr "" "Plik po stronie serwera nie nowszy niż plik lokalny %s -- bez pobierania.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Rozmiary siÄ™ różniÄ… (lokalny %s) -- pobieranie.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Plik na zdalnym serwerze jest nowszy, pobieranie.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1245,7 +1220,7 @@ msgstr "" "Plik po stronie serwera istnieje i zawiera odnoÅ›niki do innych źródeÅ‚ -- " "pobieranie.\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1254,7 +1229,7 @@ msgstr "" "pobieram.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1264,7 +1239,7 @@ msgstr "" "jednak rekurencja jest wyÅ‚Ä…czona -- nie pobieram.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1272,12 +1247,12 @@ msgstr "" "Plik na zdalnym serwerze istnieje.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1286,7 +1261,7 @@ msgstr "" "%s (%s) - zapisano na standardowe wyjÅ›cie %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1295,58 +1270,58 @@ msgstr "" "%s (%s) - zapisano %s [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - PoÅ‚Ä…czenie zamkniÄ™te przy %s bajcie. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - BÅ‚Ä…d podczas odczytu przy bajcie %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - BÅ‚Ä…d podczas odczytu przy bajcie %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "NieobsÅ‚ugiwana jakość zabezpieczenia '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "NieobsÅ‚ugiwany algorytm '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC wskazuje na %s, który nie istnieje.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie można odczytać %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: BÅ‚Ä…d w %s w linii %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: BÅ‚Ä…d skÅ‚adni w %s w linii %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Nieznane polecenie %s w %s w linii %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1357,7 +1332,7 @@ msgstr "" "ProszÄ™ sprawdzić '%s',\n" "lub wskazać inny plik przy użyciu --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1368,49 +1343,49 @@ msgstr "" "'%s',\n" "lub wskazać inny plik przy użyciu --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Ostrzeżenie: Zarówno wgetrc systemowy jak i użytkownika wskazujÄ… na %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: NieprawidÅ‚owe polecenie --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: NieprawidÅ‚owa wartość logiczna %s; proszÄ™ podać on lub off.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: NieprawidÅ‚owa wartość %s; proszÄ™ podać on, off lub quiet.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: NiewÅ‚aÅ›ciwa liczba %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s musi być użyte tylko raz\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: NieprawidÅ‚owa wartość bajtu %s.\n" # c-format -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: NieprawidÅ‚owa wartość okresu czasu %s.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1420,28 +1395,28 @@ msgstr "" "WGET_ASKPASS lub SSH_ASKPASS.\n" # c-format -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: NieprawidÅ‚owa wartość %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: NieprawidÅ‚owy nagłówek %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: NieprawidÅ‚owy nagłówek WARC %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: NieprawidÅ‚owy typ wskaźnika postÄ™pu %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1451,41 +1426,41 @@ msgstr "" " należy użyć [unix|vms|windows],[lowercase|uppercase],[nocontrol]," "[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodowanie %s nie jest prawidÅ‚owe\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konwersja z %s do %s nie jest obsÅ‚ugiwana\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Napotkano niekompletnÄ… lub nieprawidÅ‚owÄ… sekwencjÄ™ wielobajtowÄ…\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "NieobsÅ‚ugiwane errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: nie ustawiono lokalizacji\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode nie powiodÅ‚o siÄ™ (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Nie udaÅ‚o siÄ™ zamienić na maÅ‚e litery: %d: %s\n" # c-format -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1494,17 +1469,17 @@ msgstr "" "\n" "Przekierowanie wyjÅ›cia do %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logowanie zostaÅ‚o wyÅ‚Ä…czone.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "SkÅ‚adnia: %s [OPCJE]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1512,64 +1487,64 @@ msgstr "" "ObowiÄ…zkowe argumenty dÅ‚ugich opcji sÄ… też obowiÄ…zkowe dla opcji krótkich.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Uruchamianie:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version wyÅ›wietla wersjÄ™ Wgeta i koÅ„czy " "dziaÅ‚anie\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help wypisuje tÄ™ pomoc\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background przejÅ›cie w tÅ‚o po uruchomieniu\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=KOMENDA wykonuje polecenie jak z `.wgetrc'\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Rejestracja pracy i plik wejÅ›ciowy:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=PLIK rejestruje komunikaty w PLIKu\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=PLIK doÅ‚Ä…cza komunikaty do PLIKu\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug wypisuje informacje diagnostyczne\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug wypisuje informacje diagnostyczne z " "Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet cisza (żadnych komunikatów)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose szczegółowe komunikaty (zachowanie " "domyÅ›lne)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1577,7 +1552,7 @@ msgstr "" " -nv, --no-verbose bez szczegółowych komunikatów, ale nie " "cisza\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1585,7 +1560,7 @@ msgstr "" " --report-speed=JAK wypisuje szybkość w podany sposób; może " "być \"bits\"\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1593,7 +1568,7 @@ msgstr "" " -i, --input-file=PLIK wczytuje URL-e z lokalnego lub " "zewnÄ™trznego PLIKu\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1601,11 +1576,11 @@ msgstr "" " --input-metalink=PLIK wczytuje pliki obecne w lokalnym PLIKu " "Metalink\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html traktuje plik wejÅ›ciowy jako HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1614,28 +1589,28 @@ msgstr "" "HTML\n" " (-i -F) wzglÄ™dem URL-a\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=PLIK okreÅ›la plik konfiguracyjny do użycia\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config pomija odczyt pliku konfiguracyjnego\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=PLIK rejestruje przyczyny odrzucenia URL-i w " "PLIKu\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Pobieranie:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1643,18 +1618,18 @@ msgstr "" " -t, --tries=LICZBA ustawia LICZBĘ ponownych prób (0 bez " "limitu)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused ponawia pobieranie nawet po odrzuceniu\n" " poÅ‚Ä…czenia\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=PLIK zapisuje dokumenty do PLIKu\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1662,7 +1637,7 @@ msgstr "" " -nc, --no-clobber zakazuje nadpisywania istniejÄ…cych " "plików\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1670,7 +1645,7 @@ msgid "" msgstr "" " --no-config pomija odczyt pliku konfiguracyjnego\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1678,7 +1653,7 @@ msgstr "" " -c, --continue wznawia Å›ciÄ…ganie częściowo pobranego " "pliku\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1686,12 +1661,12 @@ msgstr "" " --start-pos=OFFSET rozpoczyna pobieranie od podanego " "OFFSETu\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TYP ustawia tryb wizualizacji postÄ™pów\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1699,7 +1674,7 @@ msgstr "" " --show-progress pasek postÄ™pu niezależnie od trybu " "komunikatów\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1708,7 +1683,7 @@ msgstr "" " -N, --timestamping nie pobiera ponownie plików, chyba że sÄ…\n" " nowsze niż lokalne.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1718,7 +1693,7 @@ msgstr "" " if-modified-since w trybie ze zn. " "czasu\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1726,21 +1701,21 @@ msgstr "" " --no-use-server-timestamps bez ustawiania czasu pliku lokalnego na\n" " czas taki, jak na serwerze\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response wyÅ›wietla odpowiedzi serwera\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider nie pobiera niczego\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUND ustawia wszystkie limity czasu na zadanÄ…\n" " liczbÄ™ SEKUND\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1748,7 +1723,7 @@ msgstr "" " --dns-servers=ADRESY lista serwerów DNS do odpytania (z " "przecinkami)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1756,29 +1731,29 @@ msgstr "" " --bind-dns-address=ADRES dowiÄ…zanie klienta DNS do lokalnego " "ADRESu (nazwy lub IP)\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUND ustawia limit czasu odpytywania DNS-a na\n" " zadanÄ… liczbÄ™ SEKUND\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEKUND ustawia limit czasu Å‚Ä…czenia na zadanÄ…\n" " liczbÄ™ SEKUND\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEKUND ustawia limit czasu odczytu na zadanÄ…\n" " liczbÄ™ SEKUND\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUND czeka SEKUND pomiÄ™dzy pobraniami\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1786,7 +1761,7 @@ msgstr "" " --waitretry=SEKUND czeka 1...SEKUND pomiÄ™dzy ponownÄ… próbÄ…\n" " wznowienia pobrania\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1794,37 +1769,37 @@ msgstr "" " --random-wait czeka 0.5*WAIT...1.5*WAIT sekund miÄ™dzy " "pobraniami\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy jawnie wyÅ‚Ä…cza proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ROZMIAR ustawia ograniczenie pobieranych danych\n" " na ROZMIAR\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" " --bind-address=ADRES użycie lokalnego ADRESu (nazwy lub IP)\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=SZYBKOŚĆ ogranicza szybkość pobierania do " "SZYBKOŚĆ\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache wyÅ‚Ä…cza zapisywanie podrÄ™cznych " "informacji\n" " o wyszukanych adresach DNS\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1833,7 +1808,7 @@ msgstr "" " obsÅ‚ugiwanych przez system operacyjny " "OS\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1841,15 +1816,15 @@ msgstr "" " --ignore-case ignorowanie wielkoÅ›ci liter podczas\n" " dopasowywania plików/katalogów.\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only Å‚Ä…czenie wyÅ‚Ä…cznie na adresy IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only Å‚Ä…czenie wyÅ‚Ä…cznie na adresy IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1858,21 +1833,21 @@ msgstr "" " --prefer-family=RODZINA Å‚Ä…czenie najpierw z adresami z podanej\n" " rodziny: IPv6, IPv4, none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=UÅ»YTKOWNIK ustawia UÅ»YTKOWNIKA dla ftp i http\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=HASÅO ustawia HASÅO dla ftp i http\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password prosi o podanie haseÅ‚\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1889,28 +1864,28 @@ msgstr "" " Å›rodowiskowa WGET_ASKPASS lub " "SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri wyÅ‚Ä…cza obsÅ‚ugÄ™ IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KOD użycie podanego lokalnego kodowania IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KOD użycie podanego domyÅ›lnego zdalnego " "kodowania\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink usuwanie plików przed nadpisaniem\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1918,7 +1893,7 @@ msgstr "" " --keep-badhash zachowanie plików z niezgodnÄ… sumÄ… " "(doÅ‚Ä…cza .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1926,7 +1901,7 @@ msgstr "" " --metalink-index=LICZBA LICZBA porzÄ…dkowa metaurla metalink " "application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1934,14 +1909,14 @@ msgstr "" " --metalink-over-http użycie metadanych Metalink z nagłówków " "odpowiedzi HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location preferowana lokalizacja zasobów Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1949,34 +1924,34 @@ msgstr "" " --no-xattr wyÅ‚Ä…cza zapisywanie metadanych w " "rozszerzonych atrybutach\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Katalogi:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories zakazuje tworzenia katalogów\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories wymusza tworzenie katalogów\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories zakazuje tworzenia katalogu o nazwie " "hosta\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories użycie nazwy protokoÅ‚u w katalogach\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PRZEDR zapis plików w PRZEDR/...\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1984,25 +1959,25 @@ msgstr "" " --cut-dirs=LICZBA ignoruje okreÅ›lonÄ… LICZBĘ zdalnych " "katalogów\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opcje HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UÅ»YTKOWNIK ustawia UÅ»YTKOWNIKA dla http\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HASÅO ustawia HASÅO dla http\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache zakazuje korzystania z buforowania\n" " danych przez serwer.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2011,7 +1986,7 @@ msgstr "" "jest\n" " to index.html).\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2019,18 +1994,18 @@ msgstr "" " -E, --adjust-extension zapis dokumentów HTML/CSS z wÅ‚aÅ›ciwymi\n" " rozszerzeniami.\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorowanie pola `Content-Length' " "nagłówka\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ÅAŃCUCH wstawienie ÅAŃCUCHa w nagłówki\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2038,23 +2013,23 @@ msgid "" msgstr "" " --progress=TYP ustawia tryb wizualizacji postÄ™pów\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maksymalna dozwolona liczba przekierowaÅ„ " "na stronie.\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UÅ»YTKOWNIK ustawia nazwÄ™ UÅ»YTKOWNIKA dla proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-passwd=HASÅO ustawia HASÅO dla proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2062,11 +2037,11 @@ msgstr "" " --referer=URL doÅ‚Ä…cza nagłówek `Referer: URL' do " "żądania HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers zapis nagłówków HTTP w pliku\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2074,7 +2049,7 @@ msgstr "" " -U, --user-agent=AGENT identyfikacja jako AGENT zamiast Wget/" "WERSJA\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2082,22 +2057,22 @@ msgstr "" " --no-http-keep-alive wyÅ‚Ä…cza HTTP keep-alive (trwaÅ‚e " "poÅ‚Ä…czenia)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies bez używania ciasteczek\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=PLIK wczytuje ciasteczka z PLIKu przed sesjÄ…\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=PLIK zapis ciasteczek do PLIKu po sesji\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2105,7 +2080,7 @@ msgstr "" " --keep-session-cookies wczytuje i zapisuje ciasteczka sesji " "(nietrwaÅ‚e)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2113,7 +2088,7 @@ msgstr "" " --post-data=ÅAŃCUCH użycie metody POST z ÅAŃCUCHem jako " "danymi\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2121,12 +2096,12 @@ msgstr "" " --post-file=PLIK użycie metody POST z wysÅ‚aniem zawartoÅ›ci " "PLIKu\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=MetodaHTTP użycie podanej metody w żądaniu\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2134,7 +2109,7 @@ msgstr "" " --body-data=ÅAŃCUCH wysÅ‚anie ÅAŃCUCHA jako danych; wymagane --" "method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2142,7 +2117,7 @@ msgstr "" " --body-file=PLIK wysÅ‚anie zawartoÅ›ci PLIKu; wymagane --" "method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2155,7 +2130,7 @@ msgstr "" "pliku\n" " (EKSPERYMENTALNE).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2163,7 +2138,7 @@ msgstr "" " --content-on-error wypisanie otrzymanej treÅ›ci po bÅ‚Ä™dzie " "serwera\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2175,11 +2150,11 @@ msgstr "" " HTTP bez oczekiwania na wywoÅ‚anie ze\n" " strony serwera\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opcje HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2190,52 +2165,52 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1, PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only podążanie tylko za bezpiecznymi " "odnoÅ›nikami HTTPS\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate bez sprawdzania certyfikatu serwera\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=PLIK plik z certyfikatem klienta\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYP typ certyfikatu klienta: PEM lub DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=PLIK plik klucza prywatnego\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYP typ klucza prywatnego: PEM lub DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=PLIK plik z zestawem CA\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=KATALOG katalog z listÄ… skrótów CA\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=PLIK plik z zestawem CRL\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2251,7 +2226,7 @@ msgstr "" " rozdzielonych ';' do sprawdzenia drugiej\n" " strony poÅ‚Ä…czenia\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2259,7 +2234,7 @@ msgstr "" " --random-file=PLIK plik z danymi losowymi do karmienia PRNG " "SSL\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2267,15 +2242,15 @@ msgstr "" " --egd-file=PLIK nazwa pliku gniazda EGD z danymi " "losowymi\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Opcje HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts wyÅ‚Ä…cza HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2283,11 +2258,11 @@ msgstr "" " --hsts-file Å›cieżka bazy danych HSTS (przykrywa " "domyÅ›lnÄ…)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opcje FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2295,36 +2270,36 @@ msgstr "" " --ftp-stmlf użycie formatu Stream_LF dla wszystkich\n" " binarnych plików FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=UÅ»YTKOWNIK ustawia UÅ»YTKOWNIKA dla ftp\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HASÅO ustawia HASÅO dla ftp\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing bez usuwania plików '.listing'\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob wyÅ‚Ä…cza używanie znaków globalnych dla " "FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp wyÅ‚Ä…cza \"pasywny\" tryb przesyÅ‚ania\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachowanie uprawnieÅ„ plików zdalnych\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2334,11 +2309,11 @@ msgstr "" " (nie katalogów), do których sÄ… " "dowiÄ…zania\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Opcje FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2346,7 +2321,7 @@ msgstr "" " --ftps-implicit użycie domniemanego FTPS (port " "domyÅ›lny 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2357,7 +2332,7 @@ msgstr "" " sterujÄ…cym przy otwieraniu " "poÅ‚Ä…czenia danych\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2365,7 +2340,7 @@ msgstr "" " --ftps-clear-data-connection szyfrowanie tylko kanaÅ‚u sterujÄ…cego; " "wszystkie dane nieszyfrowane\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2373,11 +2348,11 @@ msgstr "" " --ftps-fallback-to-ftp degradowanie do FTP jeÅ›li FTPS nie " "jest obsÅ‚ugiwane przez serwer\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opcje WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2385,23 +2360,23 @@ msgstr "" " --warc-file=PLIK zapis danych żądanie/odpowiedź do pliku ." "warc.gz.\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=ÅAŃCUCH wstawienie ÅAŃCUCHa do rekordu warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ROZMIAR ustawia maksymalny ROZMIAR plików WARC\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapis plików indeksowych CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2409,23 +2384,23 @@ msgstr "" " --warc-dedup=PLIK bez zapisu rekordów wymienionych w PLIKu " "CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression bez kompresji plików WARC gzipem\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests bez obliczania skrótów SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log bez zapisu pliku logu w rekordzie WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2435,15 +2410,15 @@ msgstr "" "przy\n" " zapisie WARC.\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Pobieranie rekurencyjne:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive praca rekurencyjna\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2452,7 +2427,7 @@ msgstr "" "rekurencji\n" " (inf lub 0 oznacza brak ograniczeÅ„)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2460,7 +2435,7 @@ msgstr "" " --delete-after usuniÄ™cie plików lokalnie po ich " "pobraniu\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2470,7 +2445,7 @@ msgstr "" "HTML\n" " i CSS, aby wskazywaÅ‚y na pliki lokalne\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2478,7 +2453,7 @@ msgstr "" " --convert-file-only przeksztaÅ‚cenie tylko plikowej części URL-" "i (nazw bazowych)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2486,7 +2461,7 @@ msgstr "" " --backups=N przed zapisem pliku X rotacja do N kopii " "zapasowych\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2494,7 +2469,7 @@ msgstr "" " -K, --backup-converted przed konwersjÄ… pliku X zapis jego kopii\n" " jako X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2502,7 +2477,7 @@ msgstr "" " -K, --backup-converted przed konwersjÄ… pliku X zapis jego kopii\n" " jako X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2510,7 +2485,7 @@ msgstr "" " -m, --mirror skrót dla -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2518,7 +2493,7 @@ msgstr "" " -p, --page-requisites pobranie wszystkich obrazków itp.\n" " potrzebnych by wyÅ›wietlić stronÄ™ HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2526,11 +2501,11 @@ msgstr "" " --strict-comments wÅ‚Ä…cza Å›cisÅ‚Ä… (SGML) interpretacjÄ™ " "komentarzy HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Akceptowanie/odrzucanie przy pracy rekurencyjnej:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2539,7 +2514,7 @@ msgstr "" "akceptowanych\n" " rozszerzeÅ„\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2548,29 +2523,29 @@ msgstr "" "odrzucanych\n" " rozszerzeÅ„\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=WYRAÅ»ENIE wyr. regularne okreÅ›lajÄ…ce akceptowane " "URL-e\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=WYRAÅ»ENIE wyr. regularne okreÅ›lajÄ…ce odrzucane URL-" "e\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=RODZAJ rodzaj wyrażeÅ„ regularnych (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=RODZAJ rodzaj wyrażeÅ„ regularnych (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" @@ -2578,7 +2553,7 @@ msgstr "" "akceptowanych\n" " domen\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" @@ -2586,14 +2561,14 @@ msgstr "" "odrzucanych\n" " domen\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp podążanie za odnoÅ›nikami FTP ze stron " "HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2602,7 +2577,7 @@ msgstr "" "znaczników\n" " HTML, za którymi program ma podążać\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2611,23 +2586,23 @@ msgstr "" "znaczników\n" " HTML, które majÄ… być ignorowane\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts przechodzenie na obce maszyny podczas\n" " pracy rekurencyjnej\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative podążanie tylko za odnoÅ›nikami " "wzglÄ™dnymi\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista dozwolonych katalogów\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2636,82 +2611,82 @@ msgstr "" " --trust-server-names użycie nazw podanych jako ostatnich\n" " elementów URL-i przekierowaÅ„\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista odrzucanych katalogów\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent bez wychodzenia poza katalog nadrzÄ™dny\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Prosimy o zgÅ‚aszanie bÅ‚Ä™dów i propozycji na adres \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, nie-interaktywny pobieracz sieciowy.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "HasÅ‚o dla użytkownika %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "HasÅ‚o: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Nie można utworzyć potoku\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "BÅ‚Ä…d inicjowania akcji plikowych posix_spawn dla use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "BÅ‚Ä…d ustawiania akcji plikowych posix_spawn dla use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "BÅ‚Ä…d odczytu odpowiedzi od polecenia \"%s %s\": %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Nazwa użytkownika dla '%s%s': " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "HasÅ‚o dla '%s%s@%s': " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokalizacja: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilacja: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "OdnoÅ›nik: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2720,29 +2695,29 @@ msgstr "" "GNU Wget %s zbudowany na systemie %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (Å›rodowisko)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (użytkownik)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2757,7 +2732,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2765,37 +2740,37 @@ msgstr "" "\n" "Autor oryginaÅ‚u Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Prosimy o zgÅ‚aszanie bÅ‚Ä™dów i propozycji na adres .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problem z przydzieleniem pamiÄ™ci\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "ZakoÅ„czenie z powodu bÅ‚Ä™du w %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Polecenie `%s --help' wyÅ›wietli wiÄ™cej opcji.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nieprawidÅ‚owa opcja -- `n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "ObsÅ‚uga diagnostyki nie jest wkompilowana. Zigorowano flagÄ™ --debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2804,7 +2779,7 @@ msgstr "" "Podano jednoczeÅ›nie --no-clobber i --convert-links, zostanie użyte tylko --" "convert-links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2813,26 +2788,26 @@ msgstr "" "Podano jednoczeÅ›nie --no-clobber i --convert-file-only, zostanie użyte tylko " "--convert-file-only.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" "Nie można jednoczeÅ›nie wyÅ›wietlać wiÄ™cej informacji i w ogóle nic nie " "wyÅ›wietlać.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Nie można jednoczeÅ›nie używać znaczników czasu i zakazać nadpisywania " "starych plików.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Nie można podać jednoczeÅ›nie --inet4-only i --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2844,7 +2819,7 @@ msgstr "" "lub w poÅ‚Ä…czeniu z -p lub -r. WiÄ™cej informacji w podrÄ™czniku.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2854,7 +2829,7 @@ msgstr "" "we wskazanym pliku.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2864,30 +2839,25 @@ msgstr "" "Szczegóły w podrÄ™czniku.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Plik `%s' już istnieje, bez pobierania.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "WyjÅ›cie WARC nie dziaÅ‚a z --no-clobber, --no-clobber zostanie wyÅ‚Ä…czone.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "WyjÅ›cie WARC nie dziaÅ‚a ze znacznikami czasu, zostanÄ… one wyÅ‚Ä…czone.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WyjÅ›cie WARC nie dziaÅ‚a z --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2896,14 +2866,14 @@ msgstr "" "WyjÅ›cie WARC nie dziaÅ‚a z --continue ani --start-pos, opcje te zostanÄ… " "wyÅ‚Ä…czone.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Skróty sÄ… wyÅ‚Ä…czone; deduplikacja WARC nie znajdzie powtórzonych rekordów.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2912,12 +2882,12 @@ msgstr "" "WyjÅ›cie WARC nie dziaÅ‚a z --continue ani --start-pos, opcje te zostanÄ… " "wyÅ‚Ä…czone.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Nie można podać jednoczeÅ›nie --ask-password i --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2926,17 +2896,17 @@ msgstr "" "OkreÅ›lenie jednoczeÅ›nie --start-pos oraz --continue nie jest zalecane; --" "continue zostanie wyÅ‚Ä…czone.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: brakujÄ…cy URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Nie można podać jednoczeÅ›nie --post-data i --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2945,7 +2915,7 @@ msgstr "" "Nie można użyć --post-data ani --post-file wraz z --method. --method " "oczekuje przekazania danych opcjÄ… --body-data lub --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2954,24 +2924,24 @@ msgstr "" "Å»eby użyć parametru --body-data lub --mody-file, trzeba okreÅ›lić metodÄ™ " "przez --method=MetodaHTTP.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Nie można podać jednoczeÅ›nie --body-data i --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ta wersja nie obsÅ‚uguje IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" "-k lub -r może być użyte wraz z -O tylko jeÅ›li wyjÅ›ciem jest zwykÅ‚y plik.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2980,42 +2950,42 @@ msgstr "" "--convert-links lub --convert-file-only można użyć razem tylko jeÅ›li " "wyjÅ›ciem jest zwykÅ‚y plik.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Nie udaÅ‚o siÄ™ zainicjować biblioteki libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Nie udaÅ‚o siÄ™ zainicjować kanaÅ‚u c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Nie udaÅ‚o siÄ™ odczytać adresu IP '%s'\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Nie udaÅ‚o siÄ™ ustawić serwera(ów) DNS '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nie znaleziono URL-i w %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nie udaÅ‚o siÄ™ przeanalizować pliku metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Nie udaÅ‚o siÄ™ pobrać wszystkich zasobów z %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3026,7 +2996,7 @@ msgstr "" "CaÅ‚kowity czas zegarowy: %s\n" "Pobrano: %d plików, %s w %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Ograniczenie na ilość pobieranych danych (%s bajtów) PRZEKROCZONE!\n" @@ -3182,106 +3152,106 @@ msgstr "Plik %s zostaÅ‚ pobrany, ale podpis siÄ™ nie zgadza.\n" msgid "Renaming %s to %s.\n" msgstr "Zmiana nazwy %s na %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Kontynuacja w tle.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Kontynuacja w tle, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "WyjÅ›cie zostanie zapisane do %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() nie powiodÅ‚o siÄ™\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() nie powiodÅ‚o siÄ™\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "" "%s: Nie można znaleźć dajÄ…cego siÄ™ użyć sterownika do gniazd (socket).\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "ioctl() nie powiodÅ‚o siÄ™. Nie udaÅ‚o siÄ™ ustawić gniazda w tryb blokujÄ…cy.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: uwaga: element %s pojawia siÄ™ przed każdÄ… nazwÄ… komputera\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: nieznany element (token) \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "SkÅ‚adnia: %s NETRC [NAZWA_HOSTA]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: nie można pobrać informacji o %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "UWAGA: użycie sÅ‚abego zarodka liczb losowych.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nie udaÅ‚o siÄ™ nakarmić PRNG; proszÄ™ rozważyć użycie --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Użyta wersja OpenSSL jest zbyt stara, aby obsÅ‚użyć TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Użyta wersja OpenSSL jest zbyt stara, aby obsÅ‚użyć TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: nie zaimplementowana wartość opcji 'secure-protocol' %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: bÅ‚Ä…d kontroli certyfikatu dla %s, wystawionego przez %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " BÅ‚Ä…d lokalnej kontroli centrum certyfikacji.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Napotkano samodzielnie podpisany certyfikat.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Wydany certyfikat nie jest jeszcze ważny.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Wydany certyfikat wygasÅ‚.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3290,14 +3260,14 @@ msgstr "" "%s: żadna z alternatywnych nazw w certyfikacie nie pasuje\n" "\tdo żądanej nazwy hosta %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: nazwa w certyfikacie %s nie pasuje do żądanej nazwy hosta %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3308,14 +3278,14 @@ msgstr "" " Może to oznaczać, że host nie jest tym, za który siÄ™ podaje\n" " (tzn. nie jest prawdziwym %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Aby poÅ‚Ä…czyć siÄ™ z %s w sposób niebezpieczny, można użyć `--no-check-" "certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3324,7 +3294,7 @@ msgstr "" "\n" "%*s[ pomijanie %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3332,21 +3302,21 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " w " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Nie można pobrać czÄ™stotliwoÅ›ci zegara czasu rzeczywistego: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Usuwanie %s ponieważ powinien być odrzucony.\n" @@ -3360,22 +3330,22 @@ msgstr "Nie można otworzyć %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Wczytywanie robots.txt; proszÄ™ zignorować bÅ‚Ä™dy.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "BÅ‚Ä…d podczas analizy skÅ‚adni URL-a proxy %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "BÅ‚Ä…d w URL-u proxy %s: Musi być HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "przekroczono %d przekierowaÅ„.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3383,7 +3353,7 @@ msgstr "" "Program nie może sobie poradzić.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3391,127 +3361,127 @@ msgstr "" "Ponawianie próby.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Brak bÅ‚Ä™du" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "NieobsÅ‚ugiwany schemat %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Brak schematu" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "NiewÅ‚aÅ›ciwa nazwa hosta" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "NiewÅ‚aÅ›ciwy numer portu" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "NiewÅ‚aÅ›ciwa nazwa użytkownika" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "NiedokoÅ„czony adres numeryczny IPv6" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Adresy IPv6 nie sÄ… obsÅ‚ugiwane" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "NiewÅ‚aÅ›ciwy adres numeryczny IPv6" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "ObsÅ‚uga HTTPS nie zostaÅ‚a wkompilowana" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Napotkano niekompletnÄ… lub nieprawidÅ‚owÄ… sekwencjÄ™ wielobajtowÄ…\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Nie udaÅ‚o siÄ™ przydzielić wystarczajÄ…cej iloÅ›ci pamiÄ™ci; pamięć " "wyczerpana.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Nie udaÅ‚o siÄ™ przydzielić %ld bajtów; pamięć wyczerpana.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: bufor tekstu zbyt duży (%d bajtów), przerwano.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Kontynuacja w tle, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nie udaÅ‚o siÄ™ usunąć dowiÄ…zania symbolicznego %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Nie udaÅ‚o siÄ™ zainicjować biblioteki libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Nie udaÅ‚o siÄ™ odczytać adresu IP '%s'\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Nie udaÅ‚o siÄ™ ustawić uprawnieÅ„ %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "BÅ‚Ä™dne wyrażenie regularne %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "BÅ‚Ä…d podczas dopasowywania %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3598,6 +3568,24 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Znaleziono dokÅ‚adne dopasowanie w pliku CDX. Zapis rekordu revisit do WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: opcja '--%s' nie może mieć argumentów\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: nieznana opcja '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opcja '-W %s' nie może mieć argumentów\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: opcja ' -W %s' musi mieć argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Plik `%s' już istnieje, bez pobierania.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/pt.gmo b/po/pt.gmo index 9a2172b..642e863 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 1b7e606..6de9172 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.14.128\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2013-07-03 22:22+0000\n" "Last-Translator: Helder Correia \n" "Language-Team: Portuguese \n" @@ -18,7 +18,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Erro desconhecido" @@ -28,7 +28,7 @@ msgstr "Erro desconhecido" msgid "Address family for hostname not supported" msgstr "Endereços IPv6 não suportados" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Falha temporária na resolução de nome" @@ -99,70 +99,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Erro desconhecido" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a opção '%s' é ambígua\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: a opção '-W %s' é ambígua\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: a opção '-W %s' é ambígua\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: a opção '%s' é ambígua\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opção '--%s não permite um argumento\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opção '%c%s' desconhecida\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opção '%c%s' não permite um argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opção '%s' requere um argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opção '--%s' desconhecida\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opção '%c%s' desconhecida\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s a opção requere um argumento -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opção '-W %s' é ambígua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opção '-W %s' não permite um argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opção '%s' requere um argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -182,13 +157,13 @@ msgstr "%s: a opção '%s' requere um argumento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -263,28 +238,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -303,52 +278,52 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, fuzzy, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: incapaz de resolver o endereço de ligação '%s'; a desativar a ligação.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "A conectar %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "A conectar %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "A conectar %s:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "conectado.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "falhou: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, fuzzy, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: incapaz de processar o endereço '%s'\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,175 +357,175 @@ msgstr "Não é possível remover '%s': %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Não é possível salvaguardar %s como %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Não é possível remover '%s': %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Erro de sintaxe em Set-Cookie: %s na posiçao %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "O 'cookie' vindo de %s tentou definir o domínio como %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Não é possível abrir o ficheiro de cookies '%s': %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Erro ao escrever para '%s': %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Erro ao fechar '%s': %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Tipo de listagem não suportado, a tentar o analisador de listagem Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ãndice de /%s em %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "tempo desconhecido " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Ficheiro " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Pasta " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Ligação " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Incerto " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Tamanho: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) em falta" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s em falta" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (não autoritário)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "A entrar como %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Erro na resposta do servidor, a fechar a conexão de controlo.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Erro na saudação do servidor.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "A escrita falhou, a fechar a conexão de controlo.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "O servidor recusa a entrada.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Entrada incorrecta.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Entrada com sucesso!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Erro do servidor, não é possível determinar o tipo de sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "feito. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "feito.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo '%c' desconhecido, a feito a conexão de controlo.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "feito. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD desnecessário.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -558,7 +533,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -567,38 +542,38 @@ msgstr "" "Pasta '%s' inexistente.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD não requerido.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "O ficheiro '%s' já existe; a não transferir.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Não é possível iniciar a transferência PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Não é possível analisar a resposta PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "não foi possível conectar %s porto %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Erro de cobertura (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT inválido.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -606,21 +581,21 @@ msgstr "" "\n" "REST falhou, a reiniciar.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, fuzzy, c-format msgid "File %s exists.\n" msgstr "" "O ficheiro remoto existe.\n" "\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "O ficheiro '%s' não existe.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -629,7 +604,7 @@ msgstr "" "O ficheiro '%s' não existe.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -638,40 +613,40 @@ msgstr "" "Ficheiro ou pasta '%s' inexistente.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s formou-se de repente.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, a fechar a conexão de controlo.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - conexão de dados: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Conexão de controlo fechada.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Transferência de dados cancelada.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "O ficheiro '%s' já existe; a não transferir.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -680,7 +655,7 @@ msgstr "" "%s (%s) - '%s' gravado [%s/%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -689,35 +664,35 @@ msgstr "" "%s (%s) - '%s' gravado [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "A remover %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "A usar '%s' como ficheiro de listagem temporário.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "'%s' removido.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Profundidade de recursividade %d excedeu a profundidade máxima %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "O ficheiro remoto é mais antigo que o ficheiro local '%s' -- a não " "transferir.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -726,7 +701,7 @@ msgstr "" "O ficheiro remoto é mais recente que o ficheiro local '%s' -- a transferir.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -735,258 +710,258 @@ msgstr "" "Os tamanhos não coincidem (local %s) -- a transferir.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nome da ligação simbólica inválido, a ignorar.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "Já tem a ligação simbólica correcta %s -> %s\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "A criar a ligação simbólica %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Ligações simbólicas não suportadas, a ignorar ligação simbólica '%s'.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "A ignorar a pasta '%s'.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tipo de ficheiro desconhecido ou não suportado.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: selo temporal corrompido.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "As pastas não serão transferidas, uma ves que a profundidade é %d (máximo " "%d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "A não descer para '%s', uma vez que está excluída.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "A rejeitar '%s'.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Erro ao corresponder %s com %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "Não há correspondências com o padrão '%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ãndice em HTML gravado para '%s' [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ãndice HTML gravado para '%s'.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Envie erros e sugestões para .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERRO" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Certificado não apresentado por %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, fuzzy, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certificado não apresentado por %s.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, fuzzy, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr " Certificado emitido expirado.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Certificado não apresentado por %s.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, fuzzy, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr " Certificado emitido expirado.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certificado não apresentado por %s.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr " Certificado emitido expirado.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 #, fuzzy msgid "No certificate found\n" msgstr "%s: Certificado não apresentado por %s.\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 #, fuzzy msgid "The certificate has not yet been activated\n" msgstr " Certificado emitido ainda inválido.\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 #, fuzzy msgid "The certificate has expired\n" msgstr " Certificado emitido expirado.\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, fuzzy, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" "%s: o nome do certificado '%s' não corresponde ao nome da máquina requerida " "'%s'.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Máquina desconhecida" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "A resolver %s..." -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "falhou: Endereços IPv4/IPv6 inexistentes para a máquina.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "falhou: terminou o tempo.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Não é possível resolver a ligação incompleta %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Endereço '%s' inválido: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Falha ao escrever o pedido HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Sem cabeçalhos, a assumir HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" @@ -995,133 +970,133 @@ msgstr "" "O ficheiro '%s' já existe, a não transferir.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "Ficheiro de dados POST '%s' em falta: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "A reutilizar a conexão existente com %s:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "A reutilizar a conexão existente com %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Falha ao ler a resposta do procurador ('proxy'): %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Linha de estado mal-formada" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Falhou o 'túnel' com o procurador ('proxy'): %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Esquema de autenticação desconhecido.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Esquema de autenticação desconhecido.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, fuzzy, c-format msgid "Saving to: %s\n" msgstr "A gravar em: '%s'\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "A desactivar o SSL devido a erros encontrados.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Pedido %s enviado, a aguardar resposta..." -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Nenhuns dados recebidos.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro de leitura (%s) nos cabeçalhos.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sem descrição)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Localização: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "não especificado" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [a seguir]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1129,7 +1104,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1139,81 +1114,81 @@ msgstr "" " O ficheiro já está todo transferido; nada para fazer.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Tamanho: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorado" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: carácteres de expansão ('wildcards') não suportados no HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Modo de aranha activado. Verificar se o ficheiro remoto existe.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Não é possível escrever para '%s' (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Não é possível escrever para '%s' (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Incapaz de estabelecer a conexão SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Não é possível escrever para '%s' (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRO: Redireccionamento (%d) sem localização.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O ficheiro remoto não existe -- ligação quebrada!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Falta o último cabeçalho modificado -- selos temporais desactivados.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Último cabeçalho modificado inválido -- selo temporal ignorado.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1223,16 +1198,16 @@ msgstr "" "transferir.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamanhos não coincidem (local %s) -- a transferir.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "O ficheiro remoto é mais recente, a transferir.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1242,7 +1217,7 @@ msgstr "" "transferir.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1250,7 +1225,7 @@ msgstr "" "O ficheiro remoto existe mas não contém ligações -- não transferir.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1260,7 +1235,7 @@ msgstr "" "mas recursividade está desactivada -- a não transferir.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1268,12 +1243,12 @@ msgstr "" "O ficheiro remoto existe.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: Endereço '%s' inválido: %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1282,7 +1257,7 @@ msgstr "" "%s (%s) - '%s' gravado [%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1291,58 +1266,58 @@ msgstr "" "%s (%s) - '%s' gravado [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexão fechada ao byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de leitura no byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Erro de leitura no byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Esquema não suportado" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC aponta para %s, o qual não existe.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Não é possível ler %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Erro em %s na linha %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Erro de sintaxe em %s na linha %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Comando desconhecido '%s' em %s na linha %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1350,7 +1325,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1358,77 +1333,77 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Aviso: Ambos o ficheiro de sistema e de utilizador wgetrc apontam para " "'%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Comando --execute '%s' inválido\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Valor lógico '%s' inválido; use 'on' ou 'off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Valor lógico '%s' inválido; use 'on' ou 'off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Número '%s' inválido.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Valor de byte '%s' inválido\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s Período de tempo '%s' inválido\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Valor '%s' inválido.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Cabeçãlho '%s' inválido.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Cabeçãlho '%s' inválido.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tipo de progresso '%s' inválido.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1437,40 +1412,40 @@ msgstr "" "%s: %s: Restrição '%s' inválida, use [unix|windows],[lowercase|uppercase]," "[nocontrol].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "não foi possível conectar %s porto %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1479,17 +1454,17 @@ msgstr "" "\n" "%s recebido, a redireccionar saída para '%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; a desactivar registo.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Utilização: %s [OPÇÃO]... [ENDEREÇO]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1498,68 +1473,68 @@ msgstr "" "curtas.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Arranque:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version exibir a versão do Wget e terminar.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help exibir esta ajuda.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background executar em segundo plano após o arranque.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=COMANDO executar um comando do estilo '.wgetrc'.\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Registo e ficheiro de entrada:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FICH registar mensagens em FICH.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FICH acrescentar mensagens a FICH.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug exibir informação de depuração.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug exibir informação de depuração Watt-32.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet modo silencioso.\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose modo verboso (activado por omissão).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " @@ -1567,32 +1542,32 @@ msgid "" msgstr "" " -nv, --no-verbose desactivar a verbosidade, sem silenciar.\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=FICH transferir endereços contidos em FICH.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr " -i, --input-file=FICH transferir endereços contidos em FICH.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html tratar o ficheiro de entrada como HTML.\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1602,26 +1577,26 @@ msgstr "" "antigos\n" " que o local.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --certificate=FICH FICHeiro do certificado do cliente.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies não usar 'cookies'.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Transferência:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1630,19 +1605,19 @@ msgstr "" " -t, --tries=NÚMERO definir NÚMERO de tentativas (0 para " "ilimitado).\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused tentar de novo se a conexão for recusada.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FICH escrever documentos para FICH.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1651,14 +1626,14 @@ msgstr "" " -nc, --no-clobber saltar transferências que sobreporiam\n" " ficheiros existentes.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies não usar 'cookies'.\n" +msgstr " -np, --no-parent não ascender à pasta anterior.\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1667,19 +1642,19 @@ msgstr "" " -c, --continue continuar transferência parcial de " "ficheiro.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " @@ -1687,7 +1662,7 @@ msgid "" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1698,14 +1673,14 @@ msgstr "" "antigos\n" " que o local.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1715,30 +1690,30 @@ msgstr "" "antigos\n" " que o local.\n" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response exibir a resposta do servidor.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider não transferir os ficheiros.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEGUNDOS definir tempo máximo de todas as " "tentativas.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1747,28 +1722,28 @@ msgstr "" " --bind-address=ENDEREÇO ligar a ENDEREÇO (nome ou IP) na máquina " "local.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SEGS definir o tempo máximo de pesquisa.\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SEGS definir o tempo máximo de conexão.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEGS definir o tempo máximo de leitura.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SEGUNDOS esperar SEGUNDOS entre transferências.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1776,7 +1751,7 @@ msgid "" msgstr "" " --waitretry=SEGUNDOS esperar 1..SEGUNDOS entre tentativas.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1784,20 +1759,20 @@ msgid "" msgstr "" " --random-wait esperar de 0...2*N segundos entre transf.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy desativar procurador ('proxy') " "implicitamente.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=NUMERO definir quota de transferência NÚMERO.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1806,19 +1781,19 @@ msgstr "" " --bind-address=ENDEREÇO ligar a ENDEREÇO (nome ou IP) na máquina " "local.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=TAXA limitar TAXA de transferência.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache desactivar esconderijo ('cache') de " "pesquisas DNS.\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1827,7 +1802,7 @@ msgstr "" " --restrict-file-names=OS restringir a caracteres do sistema para " "nomes de ficheiros.\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1836,17 +1811,17 @@ msgstr "" " --ignore-case ignorar capitalização ao verificar " "ficheiros/pastas.\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conectar apenas a endereços IPv4.\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conectar apenas a endereços IPv6.\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1857,23 +1832,23 @@ msgstr "" "especificada,\n" " um de IPv6, IPv4 ou nenhum.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=UTILIZADOR definir UTILIZADOR FTP e HTTP.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=SENHA definir a SENHA FTP e HTTP.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --password=SENHA definir a SENHA FTP e HTTP.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1884,57 +1859,55 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr "" " --no-proxy desativar procurador ('proxy') " "implicitamente.\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr "" " --no-glob desactivar alterações de nome de ficheiros " "FTP.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=NUMERO definir quota de transferência NÚMERO.\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " @@ -1943,37 +1916,37 @@ msgstr "" " --no-proxy desativar procurador ('proxy') " "implicitamente.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Pastas:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories não criar pastas.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories forçar a criação de pastas.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories não criar pastas do servidor.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usar o nome do protocolo nas pastas.\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX gravar ficheiros para PREFIX/...\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1982,34 +1955,34 @@ msgstr "" " --cut-dirs=NÚMERO ignorar NÚMERO componentes de pasta " "remotos.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opções HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UTILIZADOR definir o UTILIZADOR HTTP.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=SENHA definir a SENHA HTTP.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache não permitir dados em esconderijo ('cache') " "no servidor.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2017,20 +1990,20 @@ msgid "" msgstr "" " -E, --html-extension gravar documentos HTML com extensão '.html'.\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorar campo de cabeçalho `Content-Length'.\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=EXPRESSÃO inserir EXPRESSÃO entre os cabeçalhos.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2038,7 +2011,7 @@ msgid "" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" @@ -2046,19 +2019,19 @@ msgstr "" " --max-redirect máximo de redireccionamentos permitido por " "página.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UTILIZAD definir UTILIZADor do procurador ('proxy').\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=SENHA definir SENHA do procurador ('proxy').\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2067,13 +2040,13 @@ msgstr "" " --referer=ENDEREÇO incluir o cabeçalho 'Referer: ENDEREÇO' no " "pedido.\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers gravar os cabeçalhos HTTP no ficheiro.\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2082,7 +2055,7 @@ msgstr "" " -U, --user-agent=AGENTE identificar como AGENTE ao invés de Wget/" "VERSÃO.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2091,12 +2064,12 @@ msgstr "" " --no-http-keep-alive desactivar 'HTTP keep-alive' (conexões " "persistentes).\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies não usar 'cookies'.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" @@ -2104,14 +2077,14 @@ msgstr "" " --load-cookies=FICH carregar 'cookies' de FICHeiro antes da " "sessão.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FICH gravar 'cookies' para FICHeiro após a " "sessão.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2120,7 +2093,7 @@ msgstr "" " --keep-session-cookies carregar e gravar os 'cookies' da sessão (não " "permanentes).\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2129,7 +2102,7 @@ msgstr "" " --post-data=EXPRESSÃO usar o método POST; enviar EXPRESSÃO como " "dados.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2138,12 +2111,12 @@ msgstr "" " --post-file=FICHEIRO usar o método POST; enviar conteúdo de " "FICHEIRO.\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2152,7 +2125,7 @@ msgstr "" " --post-data=EXPRESSÃO usar o método POST; enviar EXPRESSÃO como " "dados.\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2161,7 +2134,7 @@ msgstr "" " --post-file=FICHEIRO usar o método POST; enviar conteúdo de " "FICHEIRO.\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2173,13 +2146,13 @@ msgstr "" " escolher nomes de fich. locais " "(EXPERIMENTAL).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2192,11 +2165,11 @@ msgstr "" " sem primeiro esperar pelo desafio do\n" " servidor.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opções HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2207,58 +2180,58 @@ msgstr "" "SSLv2,\n" " SSLv3 ou TLSv1.\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative seguir apenas ligações relativas.\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate não validar o certificado do servidor.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FICH FICHeiro do certificado do cliente.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TIPO TIPO do certificado do cliente, PEM ou DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=FICHEIRO FICHEIRO da chave privada.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TIPO TIPO da chave privada, PEM ou DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FICH FICHeiro com CAs.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=PASTA PASTA da lista de chaves de CAs.\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=FICH FICHeiro com CAs.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2268,7 +2241,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2277,64 +2250,64 @@ msgstr "" " --random-file=FICH FICHeiro com dados aleatórios para SSL " "PRNG.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=FICHEIRO FICHEIRO EGD com dados aleatórios.\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Opções HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache não permitir dados em esconderijo ('cache') " "no servidor.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opções FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=UTILIZADOR definir UTILIZADOR FTP.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SENHA definir a SENHA FTP.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing não remover ficheiros '.listing'.\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob desactivar alterações de nome de ficheiros " "FTP.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2342,14 +2315,14 @@ msgstr "" " --no-passive-ftp desactivar o modo \"passivo\" de " "transferência.\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preservar as permissões dos ficheiros " "remotos.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2358,18 +2331,18 @@ msgstr "" " --retr-symlinks em recursividade, obter ficheiros ligados " "(não pastas).\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Opções FTP:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 #, fuzzy msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " @@ -2380,37 +2353,37 @@ msgstr "" "antigos\n" " que o local.\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "Opções FTP:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --header=EXPRESSÃO inserir EXPRESSÃO entre os cabeçalhos.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" @@ -2418,29 +2391,29 @@ msgstr "" " -t, --tries=NÚMERO definir NÚMERO de tentativas (0 para " "ilimitado).\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --wdebug exibir informação de depuração Watt-32.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 #, fuzzy msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-cookies não usar 'cookies'.\n" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies não usar 'cookies'.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2449,23 +2422,23 @@ msgstr "" " --ignore-case ignorar capitalização ao verificar " "ficheiros/pastas.\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Transferência recursiva:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive especificar transferência recursiva.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2473,7 +2446,7 @@ msgid "" msgstr "" " -l, --level=NÚMERO profundidade máxima (inf ou 0 para infinito).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2482,7 +2455,7 @@ msgstr "" " --delete-after remover os ficheiros localmente após " "transferência.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2492,20 +2465,20 @@ msgstr "" " -k, --convert-links apontar as ligações em HTML para ficheiros " "locais.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 #, fuzzy msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr " --wdebug exibir informação de depuração Watt-32.\n" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2514,7 +2487,7 @@ msgstr "" " -K, --backup-converted salvaguardar com extensão '.orig' antes de " "converter.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2523,7 +2496,7 @@ msgstr "" " -K, --backup-converted salvaguardar com extensão '.orig' antes de " "converter.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2531,7 +2504,7 @@ msgid "" msgstr "" " -m, --mirror atalho para -N -r -l inf --no-remove-listing.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2540,7 +2513,7 @@ msgstr "" " -p, --page-requisites obter todas as imagens, etc. para exibir a " "página HTML.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2549,11 +2522,11 @@ msgstr "" " --strict-comments activar tratamento severo (SGML) de comentários " "HTML.\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Aceitação/Rejeitação recursiva:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2562,55 +2535,55 @@ msgstr "" " -A, --accept=LISTA LISTA de extensões aceites separadas por " "vírgula.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=LISTA LISTA de extensões rejeitadas.\n" -#: src/main.c:964 +#: src/main.c:973 #, fuzzy msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --progress=TIPO definir o TIPO de escala de progresso.\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=LISTA LISTA de domínios aceites.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=LISTA LISTA de domínios rejeitados.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp seguir ligações FTP de documentos HTML.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2618,7 +2591,7 @@ msgid "" msgstr "" " --follow-tags=LISTA LISTA de elementos HTML para seguir.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2626,24 +2599,24 @@ msgid "" msgstr "" " --ignore-tags=LISTA LISTA de elementos HTML para ignorar.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts ir para outros servidores quando " "recursivo.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative seguir apenas ligações relativas.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA LISTA de pastas permitidas.\n" -#: src/main.c:991 +#: src/main.c:1000 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2654,113 +2627,113 @@ msgstr "" "antigos\n" " que o local.\n" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA LISTA de pastas excluídas.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent não ascender à pasta anterior.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Envie erros e sugestões para .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, um transferidor de rede não interactivo.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, fuzzy, c-format msgid "Cannot create pipe\n" msgstr "Não é possível escrever para '%s' (%s).\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2775,7 +2748,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2783,69 +2756,69 @@ msgstr "" "\n" "Originalmente escrito por Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Envie erros e sugestões para .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente '%s --help' para mais opções.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opção ilegal -- '-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Não é possível ser simultaneamente verboso e silencioso.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Não é possível marcar com selo temporal e sobrepor ficheiros antigos, " "simultaneamente.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "Não é possível especificar simultaneamente --inet4-only e --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2857,7 +2830,7 @@ msgstr "" "múltiplos endereços ou em combinação com -r. Veja os detalhes no manual.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2867,7 +2840,7 @@ msgstr "" "serão colocados no ficheiro único que especificou.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2877,146 +2850,141 @@ msgstr "" "manual para detalhes.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "O ficheiro '%s' já existe; a não transferir.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, fuzzy, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Não é possível especificar simultaneamente --inet4-only e --inet6-only.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL em falta\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Não é possível especificar simultaneamente --inet4-only e --inet6-only.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" "Não é possível especificar simultaneamente --inet4-only e --inet6-only.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Erro ao remover ligação simbólica '%s': %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: incapaz de processar o endereço '%s'\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "URLs não encontrados em %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Não é possível remover '%s': %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -3026,7 +2994,7 @@ msgstr "" "TERMINADO --%s--\n" "Transferido: %d ficheiros, %s em %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Quota de transferência de %s EXCEDIDA!\n" @@ -3185,104 +3153,104 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "A remover %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "A continuar em segundo plano (fundo).\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "A continuar em segundo plano, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Resultados serão gravados em '%s'.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: 'socket driver' utilizável não encontrado.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: aviso: expressão %s aparece antes de um nome de máquina\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: expressão desconhecida \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Utilização: %s NETRC [NOME-DA-MÃQUINA]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: não é possível analisar %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: a usar uma semente aleatória fraca.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Não foi possível gerar PRNG; considere usar --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, fuzzy, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: não é possível verificar o certificado de %s, emitido por '%s':\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Incapaz de verificar localmente a autoridade do emissor.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Encontrado certificado auto-assinado.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Certificado emitido ainda inválido.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Certificado emitido expirado.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, fuzzy, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3291,7 +3259,7 @@ msgstr "" "%s: o nome do certificado '%s' não corresponde ao nome da máquina requerida " "'%s'.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, fuzzy, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3299,7 +3267,7 @@ msgstr "" "%s: o nome do certificado '%s' não corresponde ao nome da máquina requerida " "'%s'.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3307,12 +3275,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Para conectar a %s de forma insegura, use '--no-check-certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3321,29 +3289,29 @@ msgstr "" "\n" "%*s[ a saltar %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Especificação de estilo de ponto '%s' inválida; a não alterar.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " eta %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " em " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Não é possível obter a frequência de relógio de tempo real: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "A remover %s, uma vez que deveria ser rejeitado.\n" @@ -3357,22 +3325,22 @@ msgstr "Não é possível abrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "A carregar robots.txt; por favor, ignore erros.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erro ao analisar URL %s do 'proxy': %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL %s do 'proxy': Necessita ser HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redireccionamentos excedidos.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3380,7 +3348,7 @@ msgstr "" "A desistir.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3388,124 +3356,124 @@ msgstr "" "A tentar novamente.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Sem erros" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "Esquema não suportado" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Nome de máquina inválido" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Mau número de porto" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Nome de utilizador inválido" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Endereço numérico IPv6 não concluído" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Endereços IPv6 não suportados" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Endereço numérico IPv6 inválido" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, fuzzy, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Falha ao reservar %ld bytes; memória insuficiente.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Falha ao reservar %ld bytes; memória insuficiente.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "A continuar em segundo plano (fundo), pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Erro ao remover ligação simbólica '%s': %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Erro ao remover ligação simbólica '%s': %s\n" -#: src/utils.c:890 -#, fuzzy, c-format +#: src/utils.c:885 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Não é possível remover '%s': %s\n" +msgstr "" -#: src/utils.c:897 +#: src/utils.c:892 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 -#, fuzzy, c-format +#: src/utils.c:937 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: incapaz de processar o endereço '%s'\n" +msgstr "" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "não foi possível conectar %s porto %d: %s\n" +msgstr "Erro ao remover ligação simbólica '%s': %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Erro ao escrever para '%s': %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3582,25 +3550,24 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#~ msgid "" -#~ "Found no broken links.\n" -#~ "\n" -#~ msgstr "" -#~ "Não foram encontradas ligações quebradas.\n" -#~ "\n" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a opção '--%s não permite um argumento\n" -#~ msgid "" -#~ "Found %d broken link.\n" -#~ "\n" -#~ msgid_plural "" -#~ "Found %d broken links.\n" -#~ "\n" -#~ msgstr[0] "Encontrada %d ligação quebrada.\n" -#~ msgstr[1] "Encontradas %d ligações quebradas.\n" +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opção '--%s' desconhecida\n" #, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: Endereço '%s' inválido: %s\n" +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a opção '-W %s' não permite um argumento\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a opção '%s' requere um argumento\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "A autorização falhou.\n" #~ msgid "" #~ "\n" @@ -3609,17 +3576,33 @@ msgstr "" #~ "\n" #~ "%s recebido.\n" -#~ msgid "Authorization failed.\n" -#~ msgstr "A autorização falhou.\n" - #, fuzzy #~ msgid " --jobs specify how many threads use.\n" #~ msgstr " --spider não transferir os ficheiros.\n" +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "O ficheiro '%s' já existe; a não transferir.\n" + #, fuzzy #~ msgid "%s can not be used with --metalink.\n" #~ msgstr "%s: Não é possível resolver a ligação incompleta %s.\n" +#~ msgid "" +#~ "Found no broken links.\n" +#~ "\n" +#~ msgstr "" +#~ "Não foram encontradas ligações quebradas.\n" +#~ "\n" + +#~ msgid "" +#~ "Found %d broken link.\n" +#~ "\n" +#~ msgid_plural "" +#~ "Found %d broken links.\n" +#~ "\n" +#~ msgstr[0] "Encontrada %d ligação quebrada.\n" +#~ msgstr[1] "Encontradas %d ligações quebradas.\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opção ilegal -- %c\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index e3affb3..71795a0 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 3c7f78d..90517be 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-02-11 14:39-0200\n" "Last-Translator: Rodolfo Ribeiro Gomes \n" "Language-Team: Brazilian Portuguese 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Erro desconhecido de sistema" @@ -32,7 +32,7 @@ msgstr "Erro desconhecido de sistema" msgid "Address family for hostname not supported" msgstr "Não há suporte para família de endereços para nome de máquina" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Falha temporária na resolução de nome" @@ -100,78 +100,50 @@ msgstr "Interrompido por um sinal" msgid "Parameter string not correctly encoded" msgstr "Texto do parâmetro codificado incorretamente" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Erro desconhecido" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: a opção \"%s\" eÌ ambiÌgua\n" + # , c-format -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a opção \"%s\" eÌ ambiÌgua; possibilidades:" -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: a opção \"%s\" eÌ ambiÌgua\n" - # , c-format -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opção \"--%s\" não permite um argumento\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opção desconhecida \"%c%s\"\n" # , c-format -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opção \"%c%s\" não permite um argumento\n" # , c-format -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opção \"%s\" exige um argumento\n" -# , c-format -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opção desconhecida \"--%s\"\n" - -# , c-format -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opção desconhecida \"%c%s\"\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção invaÌlida -- \"%c\"\n" # , c-format -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção exige um argumento -- \"%c\"\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opção \"-W %s\" eÌ ambiÌgua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opção \"-W %s\" não permite um argumento\n" - -# , c-format -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opção \"-W %s\" exige um argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -191,13 +163,13 @@ msgstr "%s: a opção \"-W %s\" exige um argumento\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -269,28 +241,28 @@ msgstr "Expressão regular grande demais" msgid "Unmatched ) or \\)" msgstr ") ou \\) sem correspondente" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Nenhuma expressão regular anterior" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "não foi possível criar redirecionamento" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "subprocesso %s falhou" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle falhou" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "não foi possível restaurar descritor de arquivo %d: dup2 falhou" @@ -309,53 +281,53 @@ msgstr "o subprocesso %s recebeu sinal fatal %d" msgid "memory exhausted" msgstr "memória esgotada" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: não foi possível resolver endereço de associação %s; desabilitando a " "associação.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Conectando-se a %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Conectando-se a %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Conectando-se a [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF falhou: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "conectado.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "falhou: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: não foi possível resolver endereço de máquina %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR falhou: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -394,182 +366,182 @@ msgid "Cannot back up %s as %s: %s\n" msgstr "Não foi possível fazer uma cópia de segurança de %s como %s: %s\n" # , c-format -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Incapaz de obter o cookie para %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Erro de sintaxe em Set-Cookie: %s na posição %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie vindo de %s tentou designar domínio como" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Não foi possível abrir o arquivo de cookies %s: %s\n" # , c-format -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Erro ao gravar em %s: %s.\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Erro ao fechar %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Não há suporte para o tipo de listagem. Tentando usar interpretador de " "listagem UNIX.\n" # , c-format -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ãndice de /%s em %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "horário desconhecido " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Arquivo " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Diretório " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Incerto " # , c-format -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bytes)" # , c-format -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Tamanho: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) restantes" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s restantes" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (sem autoridade)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Não foi possível iniciar o SSL. Ele será desabilitado." # , c-format -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Acessando como %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Erro na resposta do servidor, fechando a conexão de controle.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Erro na saudação do servidor.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Falha de escrita, fechando a conexão de controle.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "O servidor recusou o acesso.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Identificação incorreta.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Acesso autorizado!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "O servidor não aceitou o comando \"PBSZ 0\".\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "O servidor não aceitou o comando \"PROT %c\".\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Erro do servidor, não foi possível determinar tipo de sistema.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "feito. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "feito.\n" # , c-format -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tipo \"%c\" é desconhecido, fechando a conexão de controle.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "feito. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD não é necessário.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Seção logicamente impossível foi alcançada em getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -581,7 +553,7 @@ msgstr "" "cwd_end: %d\n" # , c-format -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -590,39 +562,39 @@ msgstr "" "O diretório %s não foi encontrado.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD não exigido.\n" # , c-format -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "O arquivo já foi obtido.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Não é possível iniciar transferência PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Não foi possível entender resposta do comando PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "não foi possível se conectar a %s porta %d: %s\n" # , c-format -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Erro na associação (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT é inválido.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -630,13 +602,13 @@ msgstr "" "\n" "REST falhou, recomeçando do zero.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "O arquivo %s existe.\n" # , c-format -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "" @@ -644,7 +616,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -654,7 +626,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -663,45 +635,45 @@ msgstr "" "O arquivo ou diretório %s não foi encontrado.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s surgiu do nada.\n" # , c-format -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, fechando conexão de controle.\n" # , c-format -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Conexão de dados: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "A conexão de controle está fechada.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "A transferência dos dados foi abortada.\n" # , c-format -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "O arquivo %s já existe, não será baixado.\n" # , c-format -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(tentativa:%2d)" # , c-format -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -711,7 +683,7 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -721,36 +693,36 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Removendo %s.\n" # , c-format -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Usando %s como arquivo temporário de listagem.\n" # , c-format -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Removeu %s.\n" # , c-format -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Nível de recursão %d excedeu o nível máximo %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "O arquivo remoto não é mais novo que o local %s -- ignorando.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -759,7 +731,7 @@ msgstr "" "O arquivo remoto é mais novo que o local %s -- baixando.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -768,12 +740,12 @@ msgstr "" "Os tamanhos não coincidem (local %s) -- baixando.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nome inválido da ligação simbólica, ignorando.\n" # , c-format -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -783,254 +755,254 @@ msgstr "" "\n" # , c-format -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Criando ligação simbólica %s -> %s\n" # , c-format -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Não há suporte para ligações simbólicas, ignorando a ligação %s.\n" # , c-format -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Ignorando o diretório %s.\n" # , c-format -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: o tipo de arquivo é desconhecido ou não possui suporte.\n" # , c-format -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Incapaz de obter permissões para %s.\n" # , c-format -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: horário (timestamp) corrompido.\n" # , c-format -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Não serão baixados os diretórios, pois o nível de recursão é %d (máx. %d).\n" # , c-format -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Não descendo para %s, pois está excluído/não incluído.\n" # , c-format -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Rejeitando %s.\n" # , c-format -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Erro ao comparar %s com %s: %s.\n" # , c-format -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Não há ocorrências para o padrão %s.\n" # , c-format -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Escrito índice em formato HTML em %s [%s].\n" # , c-format -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Escrito índice em formato HTML em %s.\n" # , c-format -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ERRO: Não conseguiu abrir o diretório %s.\n" # , c-format -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ERRO: Não conseguiu abrir o certificado %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Carregou certificado CA \"%s\"\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ERRO: Falha em carregar arquivo LCR \"%s\": (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Carregou arquivo LCR \"%s\"\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ERRO: GnuTLS exige que a chave e o certificado sejam do mesmo tipo.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: valor %d para opção \"secure-protocol\" não implementado\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Por favor, relate este problema para bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: valor %d para opção \"secure-protocol\" não implementado\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ERRO" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "AVISO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Nenhum certificado apresentado por %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: O certificado de %s não é confiável.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: O certificado de %s não tem um emissor conhecido.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: O certificado de %s foi revogado.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: O signatário do certificado de %s não era uma AC.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: O certificado de %s foi assinado usando um algoritmo inseguro.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: O certificado de %s ainda não está ativo.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: O certificado de %s expirou.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Erro ao iniciar o certificado X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Nenhum certificado foi encontrado\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Erro ao analisar o certificado: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "O certificado não foi ativado ainda\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "O certificado expirou\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "O dono do certificado não coincide com o nome de máquina %s.\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "A chave pública não coincide com a chave pública memorizada!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "O certificado precisa ser X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Erro ao manipular a lista de endereços.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "A máquina é desconhecida" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Resolvendo %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "falha: Não há endereços IPv4/IPv6 para a máquina.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "falha: o tempo esgostou.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Não foi possível resolver o link incompleto %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: O URL %s é inválido: %s.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Falhou em enviar requisição HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Não foram recebidos cabeçalhos, assumindo HTTP/0.9" # , c-format -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1039,11 +1011,11 @@ msgstr "" "O arquivo %s já existe, não será baixado.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime falhou. Isso provavelmente é um bug.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1051,57 +1023,57 @@ msgstr "" "Não foi possível converter o horário para o formato HTTP. Assumindo a hora 0 " "como horário da última modificação.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "O arquivo %s de dados BODY está faltando: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reaproveitando a conexão existente para [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reaproveitando a conexão existente para %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Falhou em ler a resposta do proxy: %s.\n" # , c-format -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ERRO %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "A linha de status é inválida" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "O tunelamento pelo proxy falhou: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "O esquema de autenticação é desconhecido.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Autenticação selecionada: %s\n" # , c-format -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Salvando em: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1110,23 +1082,23 @@ msgstr "" "Ao baixar a assinatura:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Incapaz de ler o conteúdo da assinatura em arquivo temporário. Ignorando.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Não foi possível criar um arquivo temporário. Ignorando o download da " "assinatura.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Valor PRI inválido. Assumindo %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1134,45 +1106,45 @@ msgstr "" "Não foi possível encontrar resenha aceitável para recursos Metalink.\n" "Ignorando-os.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Desabilitando SSL devido aos erros encontrados.\n" # , c-format -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "A requisição %s foi enviada, aguardando resposta... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Nenhum dado foi recebido.\n" # , c-format -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Erro de leitura (%s) nos cabeçalhos.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(sem descrição)" # , c-format -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Localização: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "não especificada" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [redirecionando]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1181,7 +1153,7 @@ msgstr "" "Arquivo %s não foi modificado no servidor. Não será baixado.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1192,7 +1164,7 @@ msgstr "" "Você talvez queira adicionar a opção --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1202,63 +1174,63 @@ msgstr "" " O arquivo já foi completamente obtido; não há nada a ser feito.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Tamanho: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorado" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Aviso: Não há suporte para caracteres coringa no HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "O modo aranha está habilitado. Verifique se o arquivo remoto existe.\n" # , c-format -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Não foi possível escrever em %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Ausência de atributo obrigatório no cabeçalho recebido.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Autenticação de nome/senha falhou.\n" # , c-format -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Não foi possível escrever em arquivo WARC.\n" # , c-format -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Não foi possível escrever em arquivo WARC temporário.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Não foi possível estabelecer conexão segura (SSL).\n" # , c-format -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Não foi possível remover %s (%s).\n" # , c-format -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ERRO: Redirecionamento (%d) sem Location.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1266,23 +1238,23 @@ msgstr "" "Não foi possível localizar os dados de Metalink na resposta HTTP. Baixando " "arquivo usando HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Cabeçalhos de Metalink encontrados. Alternando para modo Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "O arquivo remoto não existe -- link quebrado!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Está faltando o cabeçalho Last-modified -- horários desligados.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "O cabeçalho Last-modified é inválido -- horário ignorado.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1291,16 +1263,16 @@ msgstr "" "O arquivo no servidor não é mais novo que o local %s -- ignorando.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Os tamanhos não coincidem (local %s) -- baixando.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "O arquivo remoto é mais novo, baixando.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1309,7 +1281,7 @@ msgstr "" "O arquivo remoto existe e pode conter links para outras fontes -- baixando.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1317,7 +1289,7 @@ msgstr "" "O arquivo remoto existe mas não contém link algum -- ignorando.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1327,7 +1299,7 @@ msgstr "" "mas a recursão está desabilitada -- ignorando.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1336,13 +1308,13 @@ msgstr "" "\n" # , c-format -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" # , c-format -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1352,7 +1324,7 @@ msgstr "" "\n" # , c-format -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1361,59 +1333,59 @@ msgstr "" "%s (%s) - %s salvo [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexão fechada no byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Erro de leitura no byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Erro de leitura no byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Não há suporte para a qualidade de proteção \"%s\".\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Não há suporte para o algoritmo \"%s\".\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC aponta para %s, que não existe.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Não foi possível ler %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Erro em %s na linha %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Erro de sintaxe em %s na linha %d.\n" # , c-format -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Comando desconhecido %s em %s na linha %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1424,7 +1396,7 @@ msgstr "" "Favor conferir \"%s\" ou\n" "especifique um arquivo diferente usando --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1435,49 +1407,49 @@ msgstr "" "conferir \"%s\" ou\n" "especifique um arquivo diferente usando --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Aviso: os arquivos wgetrc tanto do sistema como do usuário apontam para " "%s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: O comando --execute %s é inválido\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: o valor booleano %s é inválido; use \"on\" ou \"off\".\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: O valor %s é inválido; use \"on\", \"off\" ou \"quiet\".\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: O número %s é inválido.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s deve ser usado apenas uma vez\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: O valor de byte %s é inválido\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: O período de tempo %s é inválido\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1486,28 +1458,28 @@ msgstr "" "use-askpass exige um texto ou uma variável de ambiente, seja ou WGET_ASKPASS " "ou SSH_ASKPASS, estar configurada.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: O valor %s é inválido.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: O cabeçalho %s é inválido.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: O cabeçalho WARC de %s é inválido.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: O tipo de progresso %s é inválido.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1516,40 +1488,40 @@ msgstr "" "%s: %s: A restrição %s é inválida;\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "A codificação %s não é válida\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Não há suporte para a conversão de %s para %s\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Encontrou-se uma sequência multibyte inválida ou incompleta\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Erro não tratado: errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: localidade não definida\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode falhou (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Falha ao converter para minúsculas: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1558,17 +1530,17 @@ msgstr "" "\n" "Redirecionando saída para %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; desabilitando registro.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uso: %s [OPÇÃO]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1577,63 +1549,63 @@ msgstr "" "curtas.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Inicialização:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version mostra a versão do Wget e sai\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help emite esta ajuda\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background vai para o plano de fundo depois de " "iniciar\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMANDO executa um comando no estilo \".wgetrc\"\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Arquivo de entrada e de registro:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=ARQUIVO envia as mensagens de log para ARQUIVO\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ARQUIVO anexa mensagens ao ARQUIVO\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug emite muitas informações de depuração\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug emite a saída de depuração Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet silencioso (não emite nada)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose detalhista (isto é o padrão)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1641,7 +1613,7 @@ msgstr "" " -nv, --no-verbose desativa o detalhamento, sem ser " "silencioso\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1650,7 +1622,7 @@ msgstr "" "pode\n" " ser bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1659,7 +1631,7 @@ msgstr "" "local ou\n" " externo\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1667,12 +1639,12 @@ msgstr "" " --input-metalink=ARQUIVO baixa os arquivos cobertos no ARQUIVO " "Metalink\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html trata o arquivo de entrada como HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1681,29 +1653,29 @@ msgstr "" "entrada\n" " (-i -F) relativos a URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=ARQUIVO Especifica o arquivo de configuração a " "usar\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config não lê nenhum arquivo de configuração\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ARQUIVO anota as razões de rejeição de URL em " "ARQUIVO\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Download:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1712,18 +1684,18 @@ msgstr "" "NÚMERO\n" " (0 significa ilimitadas)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused tenta novamente mesmo se a conexão for\n" " recusada\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=ARQUIVO escreve os documentos no ARQUIVO\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1732,7 +1704,7 @@ msgstr "" " em arquivos existentes " "(sobrescrevendo)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1740,7 +1712,7 @@ msgid "" msgstr "" " --no-config não lê nenhum arquivo de configuração\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1748,7 +1720,7 @@ msgstr "" " -c, --continue retoma o download de um arquivo baixado\n" " parcialmente\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1756,19 +1728,19 @@ msgstr "" " --start-pos=DESLOCAMENTO baixa a partir da posição DESLOCAMENTO " "(começa do 0)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=TIPO seleciona o tipo de indicador de " "progresso\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress mostra a barra de progresso\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1779,7 +1751,7 @@ msgstr "" " a menos que ele seja mais novo que o " "local\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1788,7 +1760,7 @@ msgstr "" " --no-if-modified-since não usa a condição if-modified-since em\n" " requisições GET no modo --timestamp\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1797,22 +1769,22 @@ msgstr "" "pela\n" " do arquivo no servidor\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response exibe a resposta do servidor\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider não baixa nada\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEGUNDOS define todos os valores de tempo de " "espera\n" " como SEGUNDOS\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1820,7 +1792,7 @@ msgstr "" " --dns-servers=ENDEREÇOS lista dos servidores DNS para consulta\n" " (separados por vírgula)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1830,29 +1802,29 @@ msgstr "" " de máquina ou número IP) na máquina " "local\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEGUNDOS define o tempo de espera de busca de DNS\n" " como SEGUNDOS\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEGS define o tempo de espera da conexão como " "SEGS\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEGUNDOS define o tempo de espera de leitura como\n" " SEGUNDOS\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEGUNDOS espera SEGUNDOS entre downloads\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1861,7 +1833,7 @@ msgstr "" "tentativas de\n" " baixar\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1869,17 +1841,17 @@ msgstr "" " --random-wait espera de 0,5*ESPERA a 2*ESPERA segundos\n" " entre downloads\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy desativa explicitamente o proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=QUANTIDADE define a cota de download como " "QUANTIDADE\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1888,16 +1860,16 @@ msgstr "" "de\n" " máquina ou número IP)\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=TAXA limita a taxa de download a TAXA\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache desabilita o cache da busca de DNS\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1907,7 +1879,7 @@ msgstr "" " aos que o SO (sistema operacional) " "permite\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1916,15 +1888,15 @@ msgstr "" "arquivos/\n" " diretórios\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only conecta apenas a endereços IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only conecta apenas a endereços IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1934,22 +1906,22 @@ msgstr "" " especificada: IPv6, IPv4 ou \"none" "\" (nenhum)\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=USUÃRIO define o usuário para HTTP e FTP\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=SENHA define a senha a ser usada para HTTP e " "FTP\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pergunta as senhas\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1968,30 +1940,30 @@ msgstr "" " de ambiente WGET_ASKPASS ou " "SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri desativa o suporte para IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=COD usa COD como a codificação local para " "IRIs\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=COD usa COD como a codificação remota padrão\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" " --unlink remove o arquivo antes de se " "sobrescrever\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -2000,7 +1972,7 @@ msgstr "" "incorreta\n" " (anexa .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -2008,7 +1980,7 @@ msgstr "" " --metalink-index=NÚMERO Usa o NÚMERO-ésimo metalink do tipo\n" " application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -2016,14 +1988,14 @@ msgstr "" " --metalink-over-http usa metadados Metalink dos cabeçalhos de\n" " respostas HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location local preferido para recursos Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -2032,32 +2004,32 @@ msgstr "" "atributos de\n" " arquivo estendidos\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Diretórios:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories não cria diretórios\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories força a criação de diretórios\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories não cria diretórios do servidor\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories usa o nome do protocolo nos diretórios\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIXO salva os arquivos em PREFIXO/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2065,24 +2037,24 @@ msgstr "" " --cut-dirs=QTD ignora QTD componentes do diretório " "remoto\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Opções HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=USUÃRIO define o usuário do HTTP\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=SENHA define a senha a usar para HTTP\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache desautoriza dados em cache do servidor\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2091,7 +2063,7 @@ msgstr "" "(normalmente,\n" " ela é \"index.html\")\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2100,19 +2072,19 @@ msgstr "" "extensões\n" " apropriadas\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignora o campo \"Content-Length\" do " "cabeçalho\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=TEXTO insere TEXTO em meio aos cabeçalhos\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2121,22 +2093,22 @@ msgstr "" " --progress=TIPO seleciona o tipo de indicador de " "progresso\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect quantidade máxima de redirecionamentos\n" " permitidos por página\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=USUÃRIO define o nome de usuário do proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=SENHA define a senha para o proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2145,12 +2117,12 @@ msgstr "" "requisi-\n" " ção HTTP\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers salva os cabeçalhos HTTP no arquivo\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2158,7 +2130,7 @@ msgstr "" " -U, --user-agent=AGENTE identifica-se como AGENTE em vez de Wget/" "VERSÃO\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2167,24 +2139,24 @@ msgstr "" "conexões\n" " persistentes)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies não usa cookies\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=ARQUIVO carrega os cookies do ARQUIVO antes da " "sessão\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=ARQUIVO salva os cookies no ARQUIVO depois da " "sessão\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2193,7 +2165,7 @@ msgstr "" "permanentes) da\n" " sessão\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2201,7 +2173,7 @@ msgstr "" " --post-data=TEXTO usa o método POST; envia o TEXTO como " "dados\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2209,14 +2181,14 @@ msgstr "" " --post-file=ARQUIVO usa o método POST; envia conteúdo de " "ARQUIVO\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod usa o método \"HTTPMethod\" na " "requisição\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2224,7 +2196,7 @@ msgstr "" " --body-data=TEXTO envia TEXTO como dados. DEVE usar --" "method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2232,7 +2204,7 @@ msgstr "" " --body-file=ARQUIVO envia o conteúdo de ARQUIVO. DEVE usar --" "method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2243,7 +2215,7 @@ msgstr "" " escolher os nomes do arquivo local\n" " (EXPERIMENTAL)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2252,7 +2224,7 @@ msgstr "" "erros no\n" " servidor\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2264,11 +2236,11 @@ msgstr "" " sem antes aguardar pelo desafio do " "servidor\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Opções HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2280,41 +2252,41 @@ msgstr "" " (automático), SSLv2, SSLv3 e TLSv1 e " "PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only segue apenas links HTTPS seguros\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate não valida o certificado do servidor\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=ARQUIVO o arquivo de certificado do cliente\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TIPO tipo de certificado do client: PEM ou " "DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ARQUIVO arquivo de chave privada\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TIPO tipo de chave privada: PEM ou DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=ARQUIVO arquivo com o conjunto de ACs\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2322,11 +2294,11 @@ msgstr "" " --ca-directory=DIR diretório onde está a lista de hash das " "ACs\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=ARQUIVO arquivo com o conjunto de CRLs\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2343,7 +2315,7 @@ msgstr "" "separados\n" " por \";\" para conferir os pares\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2352,7 +2324,7 @@ msgstr "" "o\n" " GNPA do SSL\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2360,15 +2332,15 @@ msgstr "" " --egd-file=ARQUIVO arquivo nomeando o soquete EGD com dados\n" " aleatórios\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Opções HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts desabilita HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2376,11 +2348,11 @@ msgstr "" " --hsts-file caminho da base de dados HSTS\n" " (sobrescreve a padrão)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Opções FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2389,39 +2361,39 @@ msgstr "" "arquivos\n" " binários do FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=USUÃRIO define o usuário de FTP\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=SENHA define a senha para FTP\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" " --no-remove-listing não exclui os arquivos \".listing\"\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob desativa a pesquisa aproximada de nomes " "de\n" " arquivo no FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp desabilita o modo de transferência " "\"passivo\"\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions preserva as permissões do arquivo remoto\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2430,11 +2402,11 @@ msgstr "" "por\n" " ligação (não vale para diretórios)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Opções FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2442,7 +2414,7 @@ msgstr "" " --ftps-implicit usa FTPS implícito (porta padrão: " "990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2452,7 +2424,7 @@ msgstr "" " conexão de controle ao abrir a de " "dados\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2461,7 +2433,7 @@ msgstr "" " todos os dados estarão em texto " "simples\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2470,11 +2442,11 @@ msgstr "" "suportado no\n" " servidor alvo\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Opções para WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2483,22 +2455,22 @@ msgstr "" "arquivo\n" " .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=TEXTO insere TEXTO no registro warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=NÚMERO define o tamanho máximo de arquivos WARC\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx escreve arquivos de índice CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2506,18 +2478,18 @@ msgstr "" " --warc-dedup=ARQUIVO não armazena registros listados neste " "arquivo CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression não comprime arquivos WARC files com " "GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests não calcula as resenhas SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2525,7 +2497,7 @@ msgstr "" " --no-warc-keep-log não armazena arquivo de log em registro " "WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2535,16 +2507,16 @@ msgstr "" "criados\n" " pelo gravador WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Download recursivo:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive especifica como download recursivo\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2552,7 +2524,7 @@ msgstr "" " -l, --level=NÚMERO nível máximo da recursão; inf ou 0 = " "infinito\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2560,7 +2532,7 @@ msgstr "" " --delete-after exclui os arquivos localmente após baixá-" "los\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2569,7 +2541,7 @@ msgstr "" " -k, --convert-links força os links no HTML ou CSS baixado\n" " apontarem para os arquivos locais\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2579,7 +2551,7 @@ msgstr "" " (normalmente conhecida como o nome-" "base)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2588,7 +2560,7 @@ msgstr "" "de\n" " segurança (até N cópias)\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2597,7 +2569,7 @@ msgstr "" "cópia\n" " de segurança como X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2606,7 +2578,7 @@ msgstr "" "cópia\n" " de segurança como X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2614,7 +2586,7 @@ msgstr "" " -m, --mirror atalho para -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2623,7 +2595,7 @@ msgstr "" "para\n" " exibir a página HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2632,11 +2604,11 @@ msgstr "" "comen-\n" " tários HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Aceitação/Recusa de recursão:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2645,7 +2617,7 @@ msgstr "" "extensões\n" " aceitas\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2654,46 +2626,46 @@ msgstr "" "extensões\n" " rejeitadas\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGEX expressão regular para URLs aceitáveis\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGEX expressão regular para URLs a rejeitar\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TIPO tipo de expressão regular (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TIPO tipo de expressão regular (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTA lista separada por vírgulas dos domínios\n" " aceitos\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTA lista separada por vírgulas dos domínios\n" " rejeitados\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp segue os links FTP dos documentos HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2702,7 +2674,7 @@ msgstr "" "HTML\n" " permitidas\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2711,21 +2683,21 @@ msgstr "" "HTML\n" " a ignorar\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts na recursão, vai para máquinas " "estrangeiras\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative segue apenas links relativos\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista dos diretórios permitidos\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2734,84 +2706,84 @@ msgstr "" " --trust-server-names usa o nome especificado pelo último\n" " componente do URL de redirecionamento\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista dos diretórios excluídos\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent não subir ao diretório-pai\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Envie relatos de problemas e sugestões para \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, um programa não interativo para baixar arquivos da rede.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Senha para o usuário %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Senha: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Não foi possível criar redirecionamento\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Erro ao inicializar ações de arquivo para posix_spawn para use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Erro ao configurar ações de arquivo para posix_spawn para use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Erro ao ler resposta ao comando \"%s %s\": %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Nome de usuário para \"%s%s\": " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Senha para \"%s%s@%s\": " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Localidade: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Compilação: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Link: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2820,29 +2792,29 @@ msgstr "" "GNU Wget %s construído em %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (ambiente)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (usuário)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistema)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2856,7 +2828,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2864,39 +2836,39 @@ msgstr "" "\n" "Escrito originalmente por Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Por favor, envie relatos de problemas e sugestões para .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problema de alocação de memória\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Saindo devido a erro em %s\n" # , c-format -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Tente \"%s --help\" para mais opções.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: a opção é ilegal -- \"-n%c\"\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "O suporte a depuração não foi compilado. Ignorando sinalizador --debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2905,7 +2877,7 @@ msgstr "" "Tanto --no-clobber como --convert-links foram especificadas; somente --" "convert-links será usada.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2914,25 +2886,25 @@ msgstr "" "Tanto --no-clobber como --convert-file-only foram especificadas; somente --" "convert-file-only será usada.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Não pode ser \"detalhista\" e \"silencioso\" ao mesmo tempo.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Não é possível usar as opções \"timestamp\" e \"no clobber\" ao mesmo " "tempo.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "Não é possível especificar ao mesmo tempo --inet4-only e --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2944,7 +2916,7 @@ msgstr "" "detalhes.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2954,7 +2926,7 @@ msgstr "" "colocado em um único arquivo que você especificou.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2964,20 +2936,14 @@ msgstr "" "para detalhes.\n" "\n" -# , c-format -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "O arquivo \"%s\" já existe, não será baixado.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "A saída WARC não funciona com --no-clobber; --no-clobber será desabilitada.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2985,12 +2951,12 @@ msgstr "" "A saída WARC não funciona com marcação de data/hora; a marcação será " "desabilitada.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "A saída WARC não funciona com --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2999,7 +2965,7 @@ msgstr "" "A saída WARC não funciona com --continue ou --start-pos; elas serão " "desabilitadas.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -3007,7 +2973,7 @@ msgstr "" "As resenhas (digests) estão desabilitadas; não se encontrará registros " "duplicados para serem removidos.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -3016,13 +2982,13 @@ msgstr "" "A saída WARC não funciona com --continue ou --start-pos; elas serão " "desabilitadas.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Não é possível especificar ao mesmo tempo --ask-password e --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -3031,17 +2997,17 @@ msgstr "" "Não é recomendado especificar --start-pos e --continue ao mesmo tempo; --" "continue será desabilitado.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: falta o URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Não se pode especificar ao mesmo tempo --post-data e --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -3050,7 +3016,7 @@ msgstr "" "Você não pode usar --post-data ou --post-file juntamente com --method. --" "method espera dados através das opções --body-data e --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -3059,17 +3025,17 @@ msgstr "" "Você deve especificar um método através de --method=HTTPMethod para usar com " "--body-data ou --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Não se pode especificar ao mesmo tempo --body-data e --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Esta versão não oferece suporte para IRIs\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3077,7 +3043,7 @@ msgstr "" "-k ou -r pode ser usada juntamente com -O somente se a saída for um arquivo " "comum.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3087,46 +3053,46 @@ msgstr "" "for um arquivo comum.\n" # , c-format -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Falha ao iniciar libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Falhou em iniciar o canal c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Falhou em interpretar o endereço IP \"%s\"\n" # , c-format -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Falhou em definir o(s) servidor(es) DNS \"%s\" (%d)\n" # , c-format -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nenhum URL foi encontrado em %s.\n" # , c-format -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Não foi possível interpretar o arquivo metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Não foi possível baixar todos os recursos de %s.\n" # , c-format -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3138,7 +3104,7 @@ msgstr "" "Baixados: %d arquivos, %s em %s (%s)\n" # , c-format -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "EXCEDIDA a cota de download de %s!\n" @@ -3301,113 +3267,113 @@ msgstr "O arquivo %s foi obtido, mas a assinatura não coincide.\n" msgid "Renaming %s to %s.\n" msgstr "Renomeando %s para %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Continuando em plano de fundo.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Continuando em plano de fundo, pid %lu.\n" # , c-format -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "A saída será escrita em %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "falha em fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "falha em fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Não foi possível encontrar um driver de soquete usável.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "falha em ioctl(). O soquete não poderia estar configurado como bloqueante.\n" # , c-format -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: aviso: o termo %s aparece antes de qualquer nome de máquina\n" # , c-format -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: o termo \"%s\" é desconhecido\n" # , c-format -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uso: %s NETRC [NOME DA MÃQUINA]\n" # , c-format -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: não foi possível acessar %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "AVISO: usando uma semente fraca de aleatoriedade.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Não foi possível gerar semente para PRNG; considere o uso de --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Sua versão do OpenSSL é muito antiga para suportar TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Sua versão do OpenSSL é muito antiga para suportar TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" "OpenSSL: não há implementação para o valor da opção \"secure-protocol\" %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: não foi possível verificar o certificado de %s, emitido por %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Não foi possível verificar localmente a autoridade do emissor.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Foi encontrado um certificado auto-assinado.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Certificado emitido ainda não é válido.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Certificado emitido expirou.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3416,7 +3382,7 @@ msgstr "" "%s: o nome alternativo do sujeito do certificado não coincide\n" "\tcom o nome de máquina solicitado %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3424,7 +3390,7 @@ msgstr "" " %s: o nome comum no certificado %s não coincide com o nome de máquina " "solicitado %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3435,14 +3401,14 @@ msgstr "" " Isso pode ser um indício que a máquina não é quem afirma ser, isto é,\n" " que ela não é o verdadeiro %s.\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Para se conectar a %s de forma insegura, use \"--no-check-certificate\".\n" # , c-format -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3452,7 +3418,7 @@ msgstr "" "%*s[ ignorando %sK ]" # , c-format -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" @@ -3461,22 +3427,22 @@ msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " TED %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " em " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Não foi possível obter a freqüência do relógio de TEMPO REAL: %s\n" # , c-format -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Removendo %s já que ele deveria ser rejeitado.\n" @@ -3491,24 +3457,24 @@ msgstr "Não foi possível abrir %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Carregando robots.txt; por favor ignore qualquer erro.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Erro ao analisar URL do proxy %s: %s\n" # , c-format -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Erro no URL do proxy %s: Tem que ser HTTP.\n" # , c-format -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Excedeu os %d redirecionamentos.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3516,7 +3482,7 @@ msgstr "" "Desistindo.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3524,132 +3490,132 @@ msgstr "" "Tentando novamente.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Nenhum erro" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Não há suporte para o esquema %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "O esquema está faltando" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "O nome de máquina é inválido" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "O número de porta é inválido" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "O nome de usuário é inválido" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "O endereço IPv6 está incompleto" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Não há suporte para endereços IPv6" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "O endereço IPv6 é inválido" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Compilado sem suporte a HTTPS" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Encontrou-se uma sequência multibyte inválida ou incompleta\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Falhou em alocar memória suficiente; memória esgotada.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Falhou em alocar %ld bytes; memória esgotada.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: a memória para texto é muito grande (%d bytes); abortando.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continuando em plano de fundo, pid %d.\n" # , c-format -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Falha na remoção da ligação simbólica %s: %s\n" # , c-format -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Falha ao iniciar libcares\n" # , c-format -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Incapaz de obter permissões para %s.\n" # , c-format -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Incapaz de obter permissões para %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Falhou em interpretar o endereço IP \"%s\"\n" # , c-format -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Incapaz de obter permissões para %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Expressão regular inválida %s, %s\n" # , c-format -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Erro ao comparar %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3742,6 +3708,28 @@ msgstr "" "Encontrou entrada exata no arquivo CDX. Salvando registro revisitado em " "WARC.\n" +# , c-format +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a opção \"--%s\" não permite um argumento\n" + +# , c-format +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opção desconhecida \"--%s\"\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: a opção \"-W %s\" eÌ ambiÌgua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a opção \"-W %s\" não permite um argumento\n" + +# , c-format +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a opção \"-W %s\" exige um argumento\n" + +# , c-format +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "O arquivo \"%s\" já existe, não será baixado.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/ro.gmo b/po/ro.gmo index 44e5fdd..52073de 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index a1dbcfb..f87ec0f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.9.1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2003-11-01 18:02+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "Eroare necunoscutã" @@ -26,7 +26,7 @@ msgstr "Eroare necunoscut msgid "Address family for hostname not supported" msgstr "Adresele IPv6 nu sunt suportate" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -96,70 +96,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Eroare necunoscutã" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opþiunea `%s' este ambiguã\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opþiunea `%s' este ambiguã\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opþiunea `--%s' nu permite un parametru\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opþiune nerecunoscutã `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opþiunea `%c%s' nu permite un parametru\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opþiunea `%s' necesitã un parametru\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opþiune nerecunoscutã `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opþiune nerecunoscutã `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opþiune invalidã -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opþiunea necesitã un parametru -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opþiunea `W %s' este ambiguã\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opþiunea `-W %s' nu permite parametri\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opþiunea `%s' necesitã un parametru\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -179,13 +154,13 @@ msgstr "%s: op #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -260,28 +235,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -300,51 +275,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, fuzzy, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Conectare la %s[%s]:%hu..." -#: src/connect.c:291 +#: src/connect.c:289 #, fuzzy, c-format msgid "Connecting to %s:%d... " msgstr "Conectare la %s:%hu..." -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "Conectare la %s[%s]:%hu..." -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "conectat.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "eºuare: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -378,174 +353,174 @@ msgstr "Nu pot msgid "Cannot back up %s as %s: %s\n" msgstr "Nu pot face backup la %s ca %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Nu pot ºterge `%s': %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Eroare de sintaxã în Set-Cookie: %s la poziþia %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Nu pot deschide fiºierul de cookies `%s': %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "Eroare la scriere în `%s': %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "Eroare la închiderea `%s': %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Tip de listare nesuportat, se încearcã trecere la listare Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Index al /%s pe %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "duratã necunoscutã " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fiºier " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Director " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Link " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Nesigur " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s octeþi)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Dimensiune: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (neobligatoriu)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Login ca %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Eroare în rãspunsul serverului, închid conexiunea.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Eroare în salutul serverului.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Scriere eºuatã, închid conexiunea.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Serverul refuzã loginul.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Login incorect.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Admis!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Eroare server, nu se poate determina tipul sistemului.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "terminat." -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "terminat.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tip `%c' necunoscut, conexiune închisã.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "finalizat." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nenecesar.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -553,7 +528,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -562,38 +537,38 @@ msgstr "" "Nu existã directorul `%s'.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nu este necesar.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "Fiºierul `%s' existã deja, nu se mai aduce.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nu s-a putut iniþia transferul PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Nu s-a putut analiza rãspunsul PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, fuzzy, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "conectare la %s:%hu nereuºitã: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Eroare de legãturã(bind) (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT invalid.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -601,19 +576,19 @@ msgstr "" "\n" "REST eºuat, start de la început.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "Nu existã fiºierul `%s'.\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -622,7 +597,7 @@ msgstr "" "Nu existã fiºierul `%s'.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -631,88 +606,88 @@ msgstr "" "Nu existã fiºierul sau directorul `%s'.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, închid controlul conexiunii.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Conexiune de date: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Controlul conexiunii închis.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Transfer de date întrerupt.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "Fiºierul `%s' existã deja, nu se mai aduce.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(încercare:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "%s (%s) - `%s' salvat [%ld]\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "ªterg %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "Se utilizeazã `%s' ca fiºier temporar de listare.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "`%s' ºters.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Adãncimea de recurenþã %d a depaºit max. de adãncime %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Fiºierul remote nu este mai nou decãt fiºierul local `%s'--nu se aduce.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "Fiºierul remote este mai nou decãt fiºierul local `%s' -- se aduce.\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, fuzzy, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -721,11 +696,11 @@ msgstr "" "Dimensiunile nu corespund (local %ld) -- se aduce.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Nume symlink invalid, se omite.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -734,374 +709,374 @@ msgstr "" "Deja existã symlinkul corect %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Creare symlink %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Symlinkuri nesuportate, se omite symlinkul `%s'.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "Se omite directorul `%s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: tip fiºier necunoscut/nesuportat.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: identificator-timp(time-stamp) corupt.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Nu vor fi aduse directoare pentru adãncime setatã la %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Nu se coboarã la `%s' daca este exclus/neinclus.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "Refuzare `%s'.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "Eroare la scriere în `%s': %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "Nu s-au gãsit potriviri pentru tiparul `%s'.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "S-a scris indexul HTML în `%s' [%ld].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "S-a scris indexul HTML în `%s'\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Rapoarte de bug-uri prin mail ºi sugestii la .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "Eroare în analiza URL proxy: %s: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 #, fuzzy msgid "Unknown host" msgstr "Eroare necunoscutã" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Rezolvare %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "eºuare: .expirat(ã)\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Nu s-a rezolvat linkul incomplet %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, fuzzy, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: %s: Valoare invalidã `%s'.\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Scriere cerere HTTP eºuatã: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Fiºierul `%s' existã deja, nu se mai aduce.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Reutilizare conexiune cãtre %s:%hu.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, fuzzy, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Reutilizare conexiune cãtre %s:%hu.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, fuzzy, c-format msgid "Failed reading proxy response: %s\n" msgstr "Scriere cerere HTTP eºuatã: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "EROARE %s %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Linie de stare malformatã" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Schemã autentificare necunoscutã.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Schemã autentificare necunoscutã.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Cerere %s trimisã, se aºteaptã rãspuns... " -#: src/http.c:3383 +#: src/http.c:3384 #, fuzzy msgid "No data received.\n" msgstr "Nici o datã recepþionatã" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Eroare de citire (%s) în headere.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(fãrã descriere)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Locaþie: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nespecificat(ã)" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [urmeazã]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1109,7 +1084,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1119,81 +1094,81 @@ msgstr "" " Fiºierul este deja complet; nu mai e nimic de fãcut.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Dimensiune: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorat" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Avertisment: selecþiile globale(wildcards) nu sunt permise în HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Nu s-a putut stabili o conexiune SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nu se poate scrie în `%s' (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "EROARE: Redirectare (%d) fãrã locaþie.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Lipseºte headerul Last-modified -- identificatori de timp opriþi.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Headerul Last-modified invalid -- identificator de timp ignorat.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1203,16 +1178,16 @@ msgstr "" "aduce.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, fuzzy, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Dimensiunile diferã (local %ld) -- se aduce.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Fiºierul remote este mai nou, se aduce.\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1220,7 +1195,7 @@ msgid "" "\n" msgstr "Fiºierul remote este mai nou decãt fiºierul local `%s' -- se aduce.\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" @@ -1228,33 +1203,33 @@ msgid "" msgstr "" "Fiºierul remote nu este mai nou decãt fiºierul local `%s'--nu se aduce.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "Fiºierul remote este mai nou, se aduce.\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "EROARE %s %d: %s.\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1263,58 +1238,58 @@ msgstr "" "%s(%s) - `%s' salvat [%ld%ld]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, fuzzy, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Conexiune închisã la octetul %ld. " -#: src/http.c:4738 +#: src/http.c:4763 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Eroare de citire la octetul %ld (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, fuzzy, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Eroare de citire la octetul %ld/%ld (%s)." -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Schemã nesuportatã" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC þinteºte spre %s, care nu existã.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nu s-a putut citi %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Eroare în %s la linia %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, fuzzy, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Eroare în %s la linia %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: BUG: comandã necunoscutã `%s', valoare `%s'.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1322,7 +1297,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1330,120 +1305,120 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Avertisment: Fiºierele wgetrc ºi sistem ºi user trimit cãtre `%s'.\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Comandã --execute invalidã `%s'\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: Boolean invalid `%s', folosiþi `on' (activat) sau " "`off'(dezactivat).\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: Boolean invalid `%s', folosiþi `on' (activat) sau " "`off'(dezactivat).\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Numãr invalid `%s'.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Valoare octet invalidã `%s'\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Perioadã de timp invalidã `%s'.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Valoare invalidã `%s'.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Header invalid `%s'.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Header invalid `%s'.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Tip evoluþie `%s' invalid.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "%s: %s: Restricþie invalidã `%s', folosiþi `unix' sau `windows'.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "conectare la %s:%hu nereuºitã: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1452,17 +1427,17 @@ msgstr "" "\n" "%s recepþionaþi, redirectare output cãtre `%s'.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; logging dezactivat.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Folosire: %s [OPÞIUNE]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1472,291 +1447,291 @@ msgstr "" "Parametrii obligatorii pentru opþiuni lungi sunt obligatorii ºi la cele " "scurte.\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1767,212 +1742,212 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 #, fuzzy msgid "Directories:\n" msgstr "Director " -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1980,13 +1955,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1994,58 +1969,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2055,406 +2030,406 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Rapoarte de bug-uri prin mail ºi sugestii la .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, un manager de descãrcare non-interactiv.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2003 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2464,7 +2439,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2472,68 +2447,68 @@ msgstr "" "\n" "Original scris de Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "Rapoarte de bug-uri prin mail ºi sugestii la .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Încercaþi `%s --help' pentru mai multe opþiuni.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: opþiune ilegalã -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, fuzzy, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "%s: suport de debug necompilat.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Nu pot fi ºi detaliat ºi silenþios în acelaºi timp.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Nu pot ºi identifica pentru timp (timestamp) ºi lãsa fiºierele nesecþionate " "în acelaºi timp.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2541,157 +2516,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, fuzzy, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Fiºierul `%s' existã deja, nu se mai aduce.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL lipsã\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Nici un URL gãsit în %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nu pot ºterge `%s': %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, fuzzy, c-format msgid "Could not download all resources from %s.\n" msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2702,7 +2672,7 @@ msgstr "" "FINALIZAT --%s--\n" "Downloadat: %s octeþi în %d fiºiere\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Cotã de download (%s octeþi) DEPêITÃ!\n" @@ -2858,119 +2828,119 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "ªterg %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Continui în fundal.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, fuzzy, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Continui în fundal, pid %d.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "Output-ul va fi scris în `%s'.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nu am putut gãsi un driver de socket folosibil.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: avertisment: Simbolul \"%s\" apare înainte de numele maºinii\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: simbol necunoscut \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Folosire: %s NETRC [NUME_HOST]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: n-am putut stabili %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 #, fuzzy msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nu s-a selectat OpenSSL PRNG; dezactivare SSL.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2978,12 +2948,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -2992,28 +2962,28 @@ msgstr "" "\n" "%*s[ omitere %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Specificare punct invalidã `%s'; lãsat neschimbat.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "ªtergere %s pentru cã oricum ar fi trebuit refuzat.\n" @@ -3027,22 +2997,22 @@ msgstr "Nu pot converti linkurile msgid "Loading robots.txt; please ignore errors.\n" msgstr "Se încarcã robots.txt; ignoraþi erorile.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Eroare în analiza URL proxy: %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Eroare în URL proxy %s: Trebuie sã fie HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d redirectãri depãºite.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3050,7 +3020,7 @@ msgstr "" "Renunþ.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3058,126 +3028,126 @@ msgstr "" "Reîncerc.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Eroare necunoscutã" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "Schemã nesuportatã" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 #, fuzzy msgid "Invalid host name" msgstr "Nume utilizator invalid" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Numãr de port invalid" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Nume utilizator invalid" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Adresã numericã IPv6 neterminatã" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Adresele IPv6 nu sunt suportate" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Adresã numericã IPv6 invalidã" -#: src/url.c:1008 +#: src/url.c:1006 #, fuzzy msgid "HTTPS support not compiled in" msgstr "%s: suport de debug necompilat.\n" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Continui în fundal, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nu am putut scoate(unlink) symlinkul `%s': %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" -msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" +msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" +msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "Nu s-a putut primi codul(key) certificatului de la %s\n" +msgstr "S-a eºuat în încãrcarea certificatelor din %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Eroare la scriere în `%s': %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3255,12 +3225,6 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "Nici o datã recepþionatã" - #~ msgid "Unable to convert `%s' to a bind address. Reverting to ANY.\n" #~ msgstr "" #~ "Nu am putut converti `%s' într-o adresã bind. Readucere(reverting) la " @@ -3279,9 +3243,21 @@ msgstr "" #~ msgid " [%s to go]" #~ msgstr " [%s rãmaºi]" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: opþiunea `--%s' nu permite un parametru\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: opþiune nerecunoscutã `--%s'\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opþiune ilegalã -- %c\n" +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: opþiunea `W %s' este ambiguã\n" + +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opþiunea `-W %s' nu permite parametri\n" + #~ msgid "Host not found" #~ msgstr "Host negãsit" diff --git a/po/ru.gmo b/po/ru.gmo index db5508f..fc086ed 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index df7c860..2e384d3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-18 20:14+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -23,7 +23,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -31,7 +31,7 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" msgid "Address family for hostname not supported" msgstr "СемейÑтво адреÑов не поддерживаетÑÑ Ð´Ð»Ñ Ñтого имени узла" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Временный Ñбой при разрешении имени" @@ -99,70 +99,45 @@ msgstr "Прервано по Ñигналу" msgid "Parameter string not correctly encoded" msgstr "Ðеправильно закодирована Ñтрока параметров" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: двуÑмыÑленный параметр «%s»; возможные варианты:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: двуÑмыÑленный параметр «%s»\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «--%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: двуÑмыÑленный параметр «%s»; возможные варианты:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: нераÑпознанный параметр «%c%s»\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%c%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: нераÑпознанный параметр «--%s»\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: нераÑпознанный параметр «%c%s»\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: недопуÑтимый параметр — «%c»\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ — «%c»\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: параметр «-W %s» неоднозначен\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ «-W %s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -182,13 +157,13 @@ msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -260,28 +235,28 @@ msgstr "РегулÑрное выражение Ñлишком велико" msgid "Unmatched ) or \\)" msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ ) или \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Ðет предшеÑтвующего регулÑрного выражениÑ" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "не удалоÑÑŒ Ñоздать канал" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "подпроцеÑÑ %s завершилÑÑ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle завершилаÑÑŒ неудачно" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "не удалоÑÑŒ воÑÑтановить fd %d: dup2 завершилаÑÑŒ неудачно" @@ -300,51 +275,51 @@ msgstr "подпроцеÑÑ %s получил Ñигнал Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ msgid "memory exhausted" msgstr "недоÑтаточно памÑти" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: не удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ bind %s; bind отключаетÑÑ.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Подключение к %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Подключение к %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Подключение к [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "ошибка при setsockopt SO_RCVBUF: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "Ñоединение уÑтановлено.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "ошибка: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: не удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "ошибка при setsockopt SO_REUSEADDR: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -379,175 +354,175 @@ msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ðе удаётÑÑ Ñохранить %s под именем %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Ðевозможно получить кукиÑÑ‹ Ð´Ð»Ñ %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в Set-Cookie: %s в позиции %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "КукиÑÑ‹, полученные из %s, попыталиÑÑŒ изменить домен на " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "не удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл cookies %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Ошибка запиÑи в «%s»: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Ðеподдерживаемый формат лиÑтинга, пробуетÑÑ Ð°Ð½Ð°Ð»Ð¸Ð·Ð°Ñ‚Ð¾Ñ€ лиÑтинга Ð´Ð»Ñ Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Ð˜Ð½Ð´ÐµÐºÑ /%s на %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтно " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Файл " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Каталог " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "СÑылка " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "ÐеизвеÑтно " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s байт)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Размер (байт): %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) оÑталоÑÑŒ" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s оÑталоÑÑŒ" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (не доÑтоверно)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Ðевозможно инициализировать SSL. Будет отключено." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "ВыполнÑетÑÑ Ð²Ñ…Ð¾Ð´ под именем %s … " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Ошибка в ответе Ñервера, управлÑющее Ñоединение закрываетÑÑ.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Ошибка в приветÑтвии Ñервера.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Ошибка запиÑи, управлÑющее Ñоединение закрываетÑÑ.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Сервер отклонил логин.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Ðеверный логин.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Выполнен вход в ÑиÑтему!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Сервер не принÑл команду «PBSZ 0».\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Сервер не принÑл команду «PROT %c».\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Ошибка Ñервера, невозможно определить тип ÑиÑтемы.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "готово. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "готово.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "ÐеизвеÑтный тип «%c», управлÑющее Ñоединение закрываетÑÑ.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "готово. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD не нужен.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Ð’ getftp() доÑтигнута логичеÑки невозможный раздел" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -558,7 +533,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -567,37 +542,37 @@ msgstr "" "Ðет такого каталога: %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD не требуетÑÑ.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Файл уже был загружен.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ðевозможно начать PASV-передачу.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ошибка разбора ответа PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "невозможно было подключитьÑÑ Ðº %s порт %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Ошибка bind (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "ÐедопуÑтимый PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,17 +580,17 @@ msgstr "" "\n" "Сбой REST, запуÑк Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Файл %s ÑущеÑтвует.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Ðет такого файла: %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -624,7 +599,7 @@ msgstr "" "Ðет такого файла: %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -633,40 +608,40 @@ msgstr "" "Ðет такого файла или каталога: %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s вырвалÑÑ Ð² дейÑтвительноÑÑ‚ÑŒ.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, управлÑющее Ñоединение закрываетÑÑ.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Соединение: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "УправлÑющее Ñоединение закрыто.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Передача данных прервана.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s уже ÑущеÑтвует; не загружаетÑÑ.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(попытка:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -675,7 +650,7 @@ msgstr "" "%s (%s) - запиÑан в stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -684,33 +659,33 @@ msgstr "" "%s (%s) - %s Ñохранён [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "УдалÑетÑÑ %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Ð’ качеÑтве временного файла Ð´Ð»Ñ Ð»Ð¸Ñтинга иÑпользуетÑÑ %s.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Удалён %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Глубина рекурÑии %d превыÑила макÑимальную глубину %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Удалённый файл не новее локального файла %s — не загружаетÑÑ.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -719,7 +694,7 @@ msgstr "" "Удалённый файл новее локального файла %s — загружаетÑÑ.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -728,11 +703,11 @@ msgstr "" "Размеры не Ñовпадают (локальный размер %s) — загружаетÑÑ.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ ÑимволичеÑкой ÑÑылки, пропуÑкаетÑÑ.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -741,239 +716,239 @@ msgstr "" "ÐšÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÑимволичеÑÐºÐ°Ñ ÑÑылка %s -> %s уже ÑущеÑтвует.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "СоздаётÑÑ ÑимволичеÑÐºÐ°Ñ ÑÑылка %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "СимволичеÑкие ÑÑылки не поддерживаютÑÑ, ÑÑылка %s пропуÑкаетÑÑ.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "ПропуÑкаетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: неизвеÑтный/неподдерживаемый тип файла.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: повреждена метка даты/времени.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" "Каталоги не будут загружены, Ñ‚.к. глубина ÑоÑтавлÑет %d (макÑимум %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Вход в каталог «%s» не выполнÑетÑÑ, Ñ‚.к. он иÑключён/не включён.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "ОтклонÑетÑÑ %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Ошибка ÑопоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s Ñ %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðет Ñовпадений Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð¼ %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð² формате HTML запиÑан в файл «%s» [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð² формате HTML запиÑан в файл «%s».\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ОШИБКÐ: Ðе удалоÑÑŒ открыть каталог %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ОШИБКÐ: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñертификата %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Загружен Ñертификат CA «%s»\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ОШИБКÐ: Ðе удалоÑÑŒ загрузить CRL-файл «%s»: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Загружен CRL-файл «%s»\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ОШИБКÐ: Ð”Ð»Ñ GnuTLS требуетÑÑ ÐºÐ»ÑŽÑ‡ и Ñертификат одного типа.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: значение %d параметра «secure-protocol» не реализовано\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Сообщите об Ñтой ошибке по адреÑу bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: значение %d параметра «secure-protocol» не реализовано\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ОШИБКÐ" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "ПРЕДУПРЕЖДЕÐИЕ" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Ðет Ñертификата, предÑтавленного %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Ðет Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ñертификату Ð´Ð»Ñ %s.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Сертификат %s неизвеÑтно кем выпущен.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Сертификат Ð´Ð»Ñ %s отозван.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: ПодпиÑавший Ñертификат %s отÑутÑтвует в УЦ.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Ð”Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ñертификата %s иÑпользован небезопаÑный алгоритм.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Сертификат %s ещё не активирован.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Срок дейÑÑ‚Ð²Ð¸Ñ Ñертификата %s иÑтёк.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Ошибка инициализации Ñертификата X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Сертификат не найден\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Ошибка разбора Ñертификата: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Сертификат ещё не активирован\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ Ñертификата иÑтек\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Владелец Ñертификата не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ узла %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Открытый ключ не ÑоответÑтвует прикреплённому открытому ключу!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Сертификат должен ÑоответÑтвовать X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Ошибка при обработке ÑпиÑка адреÑов.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "ÐеизвеÑтный узел" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "РаÑпознаётÑÑ %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "ошибка: Ð´Ð»Ñ Ñервера нет адреÑа IPv4/IPv6.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "ошибка: Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¸Ñтекло.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: не удаётÑÑ Ñ€Ð°Ñпознать неполную ÑÑылку %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: недопуÑтимый URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Ошибка запиÑи HTTP-запроÑа: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Заголовки отÑутÑтвуют, подразумеваетÑÑ HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -982,11 +957,11 @@ msgstr "" "Файл %s уже ÑущеÑтвует — не загружаетÑÑ.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "Ошибка gmtime. ВероÑтно, из-за дефекта.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -994,55 +969,55 @@ msgstr "" "Ðевозможно преобразовать отметку времени в формат http. ОткатываемÑÑ ÐºÐ¾ " "времени 0 как времени поÑледнего изменениÑ.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "ОтÑутÑтвует файл BODY-данных %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Повторное иÑпользование ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Повторное иÑпользование ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Сбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° прокÑи: %s.\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ОШИБКР%d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ÐÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ñтрока ÑтатуÑа" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Сбой Ñ‚ÑƒÐ½Ð½ÐµÐ»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾ÐºÑи: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ñхема аутентификации.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Сохранение в: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1051,21 +1026,21 @@ msgstr "" "При Ñкачивании подпиÑи:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðевозможно прочитать Ñодержимое подпиÑи из временного файла. ПропуÑкаетÑÑ.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ðе удалоÑÑŒ Ñоздать временный файл. Скачивание подпиÑи пропуÑкаетÑÑ.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ÐедопуÑтимое значение pri. Предполагаем %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1073,42 +1048,42 @@ msgstr "" "Ðевозможно найти подходÑщую Ñ…Ñш-Ñумму (digest) Ð´Ð»Ñ Ñ€ÐµÑурÑов Metalink.\n" "Игнорируем.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "SSL отключаетÑÑ Ð¸Ð·-за обнаруженных ошибок.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½. Ожидание ответа… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ðе получено никаких данных.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ (%s) в заголовках.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(нет опиÑаниÑ)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "ÐдреÑ: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "нет данных" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [переход]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1117,7 +1092,7 @@ msgstr "" "Файл %s на Ñервере не изменилÑÑ. Скачивание пропуÑкаетÑÑ.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1128,7 +1103,7 @@ msgstr "" "Попробуйте добавить параметр --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1138,58 +1113,58 @@ msgstr "" " Файл уже полноÑтью загружен; нечего выполнÑÑ‚ÑŒ.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Длина: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "игнорируетÑÑ" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Предупреждение: в HTTP маÑки не поддерживаютÑÑ.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Включен режим робота. Проверка ÑущеÑÑ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ файла.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðевозможно запиÑать в %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "ОбÑзательный атрибут отÑутÑтвует в принÑтом Заголовке.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Ошибка аутентификации пользователÑ/паролÑ.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ðевозможно запиÑать в файл WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðевозможно запиÑать во временный файл WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ðе удаётÑÑ ÑƒÑтановить SSL-Ñоединение.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðевозможно удалить %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ОШИБКÐ: перенаправление (%d) без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1197,24 +1172,24 @@ msgstr "" "Ðевозможно найти данные Metalink в ответе HTTP. Файл ÑкачиваетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ " "HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðайдены заголовки Metalink. Переходим в режим Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удалённый файл не ÑущеÑтвует — Ð±Ð¸Ñ‚Ð°Ñ ÑÑылка!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ОтÑутÑтвует заголовок last-modified — временные отметки выключены.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "ÐедопуÑтимый заголовок last-modified — временные отметки проигнорированы.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1223,16 +1198,16 @@ msgstr "" "Файл на Ñервере не новее локального файла %s — не загружаетÑÑ.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Размеры файлов не Ñовпадают (локальный размер %s) — загружаетÑÑ.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Удалённый файл более новый, загружаетÑÑ.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1241,13 +1216,13 @@ msgstr "" "Удалённый файл ÑущеÑтвует и может Ñодержать ÑÑылки на другие реÑурÑÑ‹ — " "загружаетÑÑ.\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "Удалённый файл ÑущеÑтвует, но не Ñодержит ÑÑылок — не загружаетÑÑ.\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1256,7 +1231,7 @@ msgstr "" "Удалённый файл ÑущеÑтвует и может Ñодержать дополнительные\n" "ÑÑылки, но рекурÑÐ¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° — не загружаетÑÑ.\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1264,12 +1239,12 @@ msgstr "" "Удалённый файл ÑущеÑтвует.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1278,7 +1253,7 @@ msgstr "" "/%s (%s) - запиÑан в stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1287,58 +1262,58 @@ msgstr "" "%s (%s) - %s Ñохранён [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Соединение закрыто, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Ошибка чтениÑ, Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподдерживаемый атрибут защиты «%s».\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподдерживаемый алгоритм «%s».\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC указывает на неÑущеÑтвующий %s.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðевозможно прочитать %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Ошибка в %s в Ñтроке %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Ошибка ÑинтакÑиÑа в %s в Ñтроке %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° %s в %s Ñтроке %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1349,7 +1324,7 @@ msgstr "" "«%s»,\n" "или укажите другой файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1360,49 +1335,49 @@ msgstr "" "«%s»,\n" "или укажите другой файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Предупреждение: ÑиÑтемный и пользовательÑкий wgetrc указывают на %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" "%s: %s: Ðеверное логичеÑкое выражение %s; иÑпользуйте «on» или «off».\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Ðеверное %s; иÑпользуйте «on», «off» или «quiet».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðеверное чиÑло %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s должно иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ один раз\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðеверное значение байта %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðеверный диапазон времени %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1411,28 +1386,28 @@ msgstr "" "Ð”Ð»Ñ use-askpass требуетÑÑ Ñтрока или уÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ " "WGET_ASKPASS или SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðеверное значение %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðеверный заголовок %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ðеверный заголовок WARC %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðеверный тип прогреÑÑа %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1442,40 +1417,40 @@ msgstr "" " иÑпользуйте [unix|vms|windows],[lowercase|uppercase],[nocontrol]," "[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° %s\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Преобразование из %s в %s не поддерживаетÑÑ\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ð’Ñтречена Ð½ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ð¸Ð»Ð¸ недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Код необработанной ошибки %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: локаль не уÑтановлена\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "ошибка idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Ошибка при преобразовании в нижний региÑÑ‚Ñ€: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1484,17 +1459,17 @@ msgstr "" "\n" "Вывод перенаправлÑетÑÑ Ð² %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; журналирование отключаетÑÑ.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ИÑпользование: %s [ПÐРÐМЕТР]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1503,58 +1478,58 @@ msgstr "" "коротких параметров.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version показать верÑию Wget и завершить работу\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help показать Ñту Ñправку\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background поÑле запуÑка перейти в фоновый режим\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=КОМÐÐДРвыполнить команду в Ñтиле «.wgetrc»\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Журналирование и входной файл:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=ФÐЙЛ запиÑывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² ФÐЙЛ\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ФÐЙЛ допиÑывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² конец ФÐЙЛÐ\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug показать много отладочной информации\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug показать отладочную информацию Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ничего не выводить\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose показывать подробные ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ (по умолчанию)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1562,7 +1537,7 @@ msgstr "" " -nv, --no-verbose отключить вывод подробных Ñведений (не " "полноÑтью)\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1570,7 +1545,7 @@ msgstr "" " --report-speed=ТИП единицы Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑкной ÑпоÑобноÑти\n" " определить ТИПОМ. ТИП может быть равно bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1578,7 +1553,7 @@ msgstr "" " -i, --input-file=ФÐЙЛ загрузить URL-Ñ‹ ÑоглаÑно локальному\n" " или внешнему ФÐЙЛУ\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1586,11 +1561,11 @@ msgstr "" " --input-metalink=ФÐЙЛ Ñкачать файлы, перечиÑленные в локальном\n" " ФÐЙЛЕ Metalink\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Ñчитать, что входной файл — HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1598,25 +1573,25 @@ msgstr "" " -B, --base=URL Ñчитать, что ÑÑылки из входного файла (-i -F)\n" " указаны отноÑительно URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=ФÐЙЛ задать файл наÑтроек\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config не читать файлы наÑтроек\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ФÐЙЛ протоколировать причины отброÑа URL в ФÐЙЛ\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Загрузка:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1624,18 +1599,18 @@ msgstr "" " -t, --tries=ЧИСЛО уÑтановить ЧИСЛО повторных попыток\n" " (0 без ограничениÑ)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused повторÑÑ‚ÑŒ, даже еÑли в подключении " "отказано\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=ФÐЙЛ запиÑывать документы в ФÐЙЛ\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1644,14 +1619,14 @@ msgstr "" " загрузке уже ÑущеÑтвующих файлов\n" " (и их перезапиÑи)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config не читать файлы наÑтроек\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1659,7 +1634,7 @@ msgstr "" " -c, --continue возобновить загрузку чаÑтично загруженного\n" " файла\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1667,11 +1642,11 @@ msgstr "" " --start-pos=СМЕЩЕÐИЕ начинать загрузку Ñо СМЕЩЕÐИЯ (ÑчитаетÑÑ Ñ " "0)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=ТИП выбрать тип индикатора выполнениÑ\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1679,7 +1654,7 @@ msgstr "" " --show-progress показывать индикатор Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² любом\n" " режиме подробноÑти\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1689,7 +1664,7 @@ msgstr "" "они\n" " не новее, чем локальные\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1700,7 +1675,7 @@ msgstr "" "учёта\n" " меток времени\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1708,21 +1683,21 @@ msgstr "" " --no-use-server-timestamps не уÑтанавливать метку времени локальному\n" " файлу, полученную Ñ Ñервера\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response вывод ответа Ñервера\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ничего не загружать\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДЫ уÑтановка значений вÑех тайм-аутов равными\n" " чиÑлу СЕКУÐД\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1730,7 +1705,7 @@ msgstr "" " --dns-servers=ÐДРЕСРÑпиÑок запрашиваемых Ñерверов DNS\n" " (через запÑтую)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1739,25 +1714,25 @@ msgstr "" " (Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° или IP) локального " "компьютера\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕК уÑтановка тайм-аута поиÑка в DNS в СЕК\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕК уÑтановка тайм-аута Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð² СЕК\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=СЕК уÑтановка тайм-аута Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð² СЕК\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=СЕКУÐДЫ пауза в СЕКУÐДÐÐ¥ между загрузками\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1765,7 +1740,7 @@ msgstr "" " --waitretry=СЕКУÐДЫ пауза в 1..СЕКУÐДЫ между повторными\n" " попытками загрузки\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1773,16 +1748,16 @@ msgstr "" " --random-wait пауза в 0.5*WAIT...1.5*WAIT Ñекунд\n" " между загрузками\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy Ñвно выключить прокÑи\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ЧИСЛО уÑтановить величину квоты загрузки в ЧИСЛО\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1790,15 +1765,15 @@ msgstr "" " --bind-address=ÐДРЕС привÑзать ÐДРЕС (Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð° или IP)\n" " локального компьютера\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=СКОРОСТЬ ограничить СКОРОСТЬ загрузки\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache отключить кÑширование DNS-запроÑов\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1806,7 +1781,7 @@ msgstr "" " --restrict-file-names=ОС иÑпользовать в именах файлов Ñимволы,\n" " допуÑтимые в ОС\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1814,15 +1789,15 @@ msgstr "" " --ignore-case игнорировать региÑÑ‚Ñ€ при ÑопоÑтавлении\n" " файлов и/или каталогов\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only подключатьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к адреÑам IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only подключатьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к адреÑам IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1832,23 +1807,23 @@ msgstr "" " ÑемейÑтва (может быть IPv6, IPv4 или " "ничего)\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ПОЛЬЗОВÐТЕЛЬ уÑтановить и ftp- и http-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð²\n" " ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ПÐРОЛЬ уÑтановить ftp- и http-пароль в ПÐРОЛЬ\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password запрашивать пароли\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1864,29 +1839,29 @@ msgstr "" " Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ WGET_ASKPASS \n" " или SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri выключить поддержку IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КДР иÑпользовать КДР как локальную кодировку\n" " Ð´Ð»Ñ IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КДР иÑпользовать КДР как удалённую кодировку\n" " по умолчанию\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink удалить файл перед затиранием\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1894,7 +1869,7 @@ msgstr "" " --keep-badhash оÑтавлÑÑ‚ÑŒ файлы Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼Ð¸\n" " контрольными Ñуммами (добавлÑÑ .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1902,7 +1877,7 @@ msgstr "" " --metalink-index=ÐОМЕР порÑдковый ÐОМЕР metaurl\n" " Metalink application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1910,7 +1885,7 @@ msgstr "" " --metalink-over-http иÑпользовать метаданные Metalink из\n" " заголовка ответов HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1918,7 +1893,7 @@ msgstr "" " --preferred-location предпочитаемое раÑположение реÑурÑов " "Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1926,32 +1901,32 @@ msgstr "" " --no-xattr выключить хранилище метаданных в\n" " раÑширенных файловых атрибутах\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Каталоги:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñоздавать каталоги\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories принудительно Ñоздавать каталоги\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories не Ñоздавать каталоги как на узле\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories иÑпользовать Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° в каталогах\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ПРЕФИКС ÑохранÑÑ‚ÑŒ файлы в ПРЕФИКС/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1959,25 +1934,25 @@ msgstr "" " --cut-dirs=ЧИСЛО игнорировать ЧИСЛО компонентов удалённого\n" " каталога\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Параметры HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=ПОЛЬЗОВ. уÑтановить http-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=ПÐРОЛЬ уÑтановить http-пароль в ПÐРОЛЬ\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache отвергать кÑшированные Ñервером данные\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1985,7 +1960,7 @@ msgstr "" " --default-page=ИМЯ изменить Ð¸Ð¼Ñ Ñтраницы по умолчанию (обычно\n" " Ñто «index.html»)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1993,43 +1968,43 @@ msgstr "" " -E, --adjust-extension ÑохранÑÑ‚ÑŒ документы HTML/CSS Ñ Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ‰Ð¸Ð¼Ð¸\n" " раÑширениÑми\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length игнорировать поле заголовка «Content-Length»\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=СТРОКРвÑтавить СТРОКУ между заголовками\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=ТИП выбрать тип индикатора выполнениÑ\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect макÑимально допуÑтимое чиÑло перенаправлений\n" " на Ñтраницу\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ПОЛЬЗОВ. уÑтановить ПОЛЬЗОВÐТЕЛЯ в качеÑтве имени\n" " Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑи\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ПÐРОЛЬ уÑтановить ПÐРОЛЬ в качеÑтве Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð´Ð»Ñ\n" " прокÑи\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2037,11 +2012,11 @@ msgstr "" " --referer=URL включить в HTTP-Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº «Referer: " "URL»\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers ÑохранÑÑ‚ÑŒ HTTP-заголовки в файл\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2049,7 +2024,7 @@ msgstr "" " -U, --user-agent=ÐГЕÐТ идентифицировать ÑÐµÐ±Ñ ÐºÐ°Ðº ÐГЕÐТ вмеÑто\n" " Wget/ВЕРСИЯ\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2057,21 +2032,21 @@ msgstr "" " --no-http-keep-alive отключить поддержание активноÑти HTTP\n" " (поÑтоÑнные подключениÑ)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не иÑпользовать кукиÑÑ‹\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=ФÐЙЛ загрузить кукиÑÑ‹ из ФÐЙЛРперед ÑеанÑом\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=ФÐЙЛ Ñохранить кукиÑÑ‹ в ФÐЙЛ поÑле ÑеанÑа\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2079,7 +2054,7 @@ msgstr "" " --keep-session-cookies загрузить и Ñохранить кукиÑÑ‹ ÑеанÑа\n" " (непоÑтоÑнные)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2087,7 +2062,7 @@ msgstr "" " --post-data=СТРОКРиÑпользовать метод POST; отправка СТРОКИ в\n" " качеÑтве данных\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2096,13 +2071,13 @@ msgstr "" "Ñодержимого\n" " ФÐЙЛÐ\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod иÑпользовать метод «HTTPMethod» в заголовке\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2110,7 +2085,7 @@ msgstr "" " --body-data=СТРОКРотправка СТРОКИ в качеÑтве данных;\n" " ДОЛЖЕРбыть указан параметр --method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2118,7 +2093,7 @@ msgstr "" " --body-file=ФÐЙЛ отправка Ñодержимого ФÐЙЛÐ;\n" " ДОЛЖЕРбыть указан параметр --method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2129,14 +2104,14 @@ msgstr "" " при выборе имён Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… файлов\n" " (ЭКСПЕРИМЕÐТÐЛЬÐЫЙ)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error выводить принÑтые данные при ошибках Ñервера\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2147,11 +2122,11 @@ msgstr "" " Basic HTTP не дожидаÑÑÑŒ первого ответа\n" " Ñервера\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Параметры HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2161,51 +2136,51 @@ msgstr "" " --secure-protocol=ПР выбор безопаÑного протокола: auto, SSLv2,\n" " SSLv3, TLSv1 и PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only переходить только по безопаÑным ÑÑылкам " "HTTPS\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate не проверÑÑ‚ÑŒ Ñертификат Ñервера\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FILE файл Ñертификата пользователÑ\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=ТИП тип Ñертификата пользователÑ: PEM или DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ФÐЙЛ файл Ñекретного ключа\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ТИП тип Ñекретного ключа: PEM или DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=ФÐЙЛ файл Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ CA\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=КÐТ каталог, в котором хранитÑÑ ÑпиÑок CA\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=ФÐЙЛ файл Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ CRL\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2220,14 +2195,14 @@ msgstr "" "«;»,\n" " по которым проверÑетÑÑ Ð¾Ñ‚Ð²ÐµÑ‚Ð½Ñ‹Ð¹ узел\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=ФÐЙЛ файл Ñо Ñлучайными данными Ð´Ð»Ñ SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2235,15 +2210,15 @@ msgstr "" " --egd-file=ФÐЙЛ файл, определÑющий Ñокет EGD Ñо Ñлучайными " "данными\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Параметры HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts отключить HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2251,11 +2226,11 @@ msgstr "" " --hsts-file путь к базе данных HSTS (заменит значение\n" " по умолчанию)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Параметры FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2263,34 +2238,34 @@ msgstr "" " --ftp-stmlf иÑпользовать формат Stream_LF Ð´Ð»Ñ Ð²Ñех\n" " двоичных файлов FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=ПОЛЬЗОВÐТЕЛЬ уÑтановить ftp-Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ПОЛЬЗОВÐТЕЛЬ\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=ПÐРОЛЬ уÑтановить ftp-пароль в ПÐРОЛЬ\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не удалÑÑ‚ÑŒ файлы «.listing»\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob выключить маÑки Ð´Ð»Ñ Ð¸Ð¼Ñ‘Ð½ файлов FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp отключить «паÑÑивный» режим передачи\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions ÑохранÑÑ‚ÑŒ права доÑтупа удалённых файлов\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2298,11 +2273,11 @@ msgstr "" " --retr-symlinks при рекурÑии загружать файлы по ÑÑылкам\n" " (не каталоги)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Параметры FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2310,7 +2285,7 @@ msgstr "" " --ftps-implicit безуÑловно иÑпользовать FTPS (порт\n" " по умолчанию — 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2320,7 +2295,7 @@ msgstr "" " в канале управлениÑ, при открытии\n" " канала данных\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2328,7 +2303,7 @@ msgstr "" " --ftps-clear-data-connection шифровать только канал управлениÑ;\n" " данные не шифруютÑÑ\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2336,11 +2311,11 @@ msgstr "" " --ftps-fallback-to-ftp вернутьÑÑ Ðº FTP, еÑли FTPS не\n" " поддерживаетÑÑ Ñервером\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Параметры WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2348,23 +2323,23 @@ msgstr "" " --warc-file=ФÐЙЛ запиÑать данные запроÑа/ответа в файл .warc." "gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=СТРОКРвÑтавить СТРОКУ в запиÑÑŒ warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ЧИСЛО макÑимальный размер файлов WARC равен " "ЧИСЛУ\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx запиÑать индекÑные файлы CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2372,24 +2347,24 @@ msgstr "" " --warc-dedup=ФÐЙЛ не ÑохранÑÑ‚ÑŒ запиÑи, перечиÑленные в файле " "CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression не Ñжимать файлы WARC Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests не вычиÑлÑÑ‚ÑŒ дайджеÑÑ‚Ñ‹ SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log не ÑохранÑÑ‚ÑŒ файл журнала в запиÑи WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2398,28 +2373,28 @@ msgstr "" " --warc-tempdir=КÐТÐЛОГ раÑположение Ð´Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ñ… файлов,\n" " Ñоздаваемых процедурой запиÑи WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "РекурÑÐ¸Ð²Ð½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive включение рекурÑивной загрузки\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" " -l, --level=ЧИСЛО глубина рекурÑии (inf и 0 — беÑконечноÑÑ‚ÑŒ)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after удалÑÑ‚ÑŒ локальные файлы поÑле загрузки\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2428,7 +2403,7 @@ msgstr "" " -k, --convert-links делать ÑÑылки локальными в загруженном\n" " HTML или CSS\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2436,7 +2411,7 @@ msgstr "" " --convert-file-only преобразовывать только файловую чаÑÑ‚ÑŒ URL\n" " (базовую чаÑÑ‚ÑŒ имени)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2444,7 +2419,7 @@ msgstr "" " --backups=N перед запиÑью файла X, ротировать до N\n" " резервных файлов\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2452,7 +2427,7 @@ msgstr "" " -K, --backup-converted перед преобразованием файла X делать резервную\n" " копию в виде X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2460,7 +2435,7 @@ msgstr "" " -K, --backup-converted перед преобразованием файла X делать резервную\n" " копию в виде X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2468,7 +2443,7 @@ msgstr "" " -m, --mirror короткий параметр, Ñквивалентный\n" " -N -r -l inf --no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2476,7 +2451,7 @@ msgstr "" " -p, --page-requisites загрузить вÑе Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¸ проч., необходимые\n" " Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ HTML-Ñтраницы\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2484,11 +2459,11 @@ msgstr "" " --strict-comments включить Ñтрогую (SGML) обработку комментариев\n" " HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "РазрешениÑ/запреты при рекурÑии:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2496,7 +2471,7 @@ msgstr "" " -A, --accept=СПИСОК ÑпиÑок разрешённых раÑширений\n" " через запÑтую\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2504,47 +2479,47 @@ msgstr "" " -R, --reject=СПИСОК ÑпиÑок запрещённых раÑширений,\n" " разделённых запÑтыми.\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=РЕГВЫР регулÑрное выражение Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½Ñ‹Ñ… URL\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=РЕГВЫР регулÑрное выражение Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ñ… URL\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ТИП тип регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=ТИП тип регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=СПИСОК ÑпиÑок разрешённых доменов,\n" " через запÑтую\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСОК ÑпиÑок запрещённых доменов,\n" " через запÑтую\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp Ñледовать по ÑÑылкам FTP в HTML-" "документах\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2552,7 +2527,7 @@ msgstr "" " --follow-tags=СПИСОК ÑпиÑок иÑпользуемых тегов HTML,\n" " через запÑтую\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2560,22 +2535,22 @@ msgstr "" " --ignore-tags=СПИСОК ÑпиÑок игнорируемых тегов HTML,\n" " через запÑтую\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts заходить на чужие узлы при рекурÑии\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative Ñледовать только по отноÑительным " "ÑÑылкам\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=СПИСОК ÑпиÑок разрешённых каталогов\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2584,86 +2559,86 @@ msgstr "" " --trust-server-names иÑпользовать имÑ, указанное в перенаправлÑющем URL,\n" " в качеÑтве поÑледнего компонента.\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=СПИСОК ÑпиÑок иÑключаемых каталогов\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не подниматьÑÑ Ð² родительÑкий каталог\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках и Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñйте на \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" "GNU Wget %s, программа Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файлов из Ñети в автономном режиме.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Пароль Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Пароль: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе удалоÑÑŒ Ñоздать канал\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Ошибка инициализации объекта файловых дейÑтвий при spawn Ð´Ð»Ñ use-askpass: " "%d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Ошибка Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ñƒ файловых дейÑтвий при spawn Ð´Ð»Ñ use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° команды «%s %s»: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Â«%s%s»: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль Ð´Ð»Ñ Â«%s%s@%s»: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Локаль: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "КомпилÑциÑ: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "СÑылка: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2672,29 +2647,29 @@ msgstr "" "GNU Wget %s Ð´Ð»Ñ %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (Ñреда)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (пользователь)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (ÑиÑтема)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright (C) %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2709,7 +2684,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2717,36 +2692,36 @@ msgstr "" "\n" "Ðвтор оригинальной верÑии: Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках и вопроÑÑ‹ отправлÑйте на .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Проблема Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñти\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Завершение работы из-за ошибки в %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Дополнительные параметры выводÑÑ‚ÑÑ Ð¿Ð¾ команде «%s --help».\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: недопуÑтимый параметр — «-n%c»\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Собрано без поддержки отладки. Флаг --debug игнорируетÑÑ.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2755,7 +2730,7 @@ msgstr "" "Указаны Ñразу --no-clobber и --convert-links, будет иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ --" "convert-links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2764,24 +2739,24 @@ msgstr "" "Указаны Ñразу --no-clobber и --convert-file-only, будет иÑпользоватьÑÑ " "только --convert-file-only.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðевозможно одновременно иÑпользовать режимы verbose и quiet.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ðевозможно одновременно иÑпользовать временные метки и не затирать Ñтарые " "файлы.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðевозможно указать и --inet4-only, и --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2792,7 +2767,7 @@ msgstr "" "неÑколько URL, или в комбинации Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ð¼Ð¸ -p или -r.\n" "ПодробноÑти Ñм. в документации.\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2802,7 +2777,7 @@ msgstr "" "загруженные данные будут помещены в один файл.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2812,12 +2787,7 @@ msgstr "" "параметр -O. ПодробноÑти Ñмотрите в руководÑтве.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Файл «%s» уже ÑущеÑтвует; не загружаетÑÑ.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2825,19 +2795,19 @@ msgstr "" "Вывод WARC не работает Ñ --no-clobber, параметр --no-clobber будет " "отключён.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Вывод WARC не работает Ñ Ð¼ÐµÑ‚ÐºÐ°Ð¼Ð¸ времени, метки времени будут отключены.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Вывод WARC не работает Ñ --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2845,7 +2815,7 @@ msgid "" msgstr "" "Вывод WARC не работает Ñ --continue или --start-pos; они будут отключены.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2853,7 +2823,7 @@ msgstr "" "ДайджеÑÑ‚ отключён; Ð´ÐµÐ´ÑƒÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ WARC не будет находить повторÑющиеÑÑ " "запиÑи.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2861,12 +2831,12 @@ msgid "" msgstr "" "Вывод WARC не работает Ñ --continue или --start-pos; они будут отключены.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðевозможно указать Ñразу --ask-password и --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2875,17 +2845,17 @@ msgstr "" "Ðе рекомендуетÑÑ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --start-pos и --continue одновременно; --continue " "будет отключён.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: отÑутÑтвует URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --post-data и --post-file одновременно.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2894,7 +2864,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --post-data или --post-file вмеÑте Ñ --method. Параметр " "--method предполагает данные в параметрах --body-data и --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2903,17 +2873,17 @@ msgstr "" "Чтобы иÑпользовать --body-data или --body-file вы должны указать " "иÑпользуемый метод через параметр --method=HTTPMethod.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ --body-data и --body-file одновременно.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Эта верÑÐ¸Ñ Ð½Ðµ поддерживает IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2921,7 +2891,7 @@ msgstr "" "Параметр -k или -r может иÑпользовать только вмеÑте Ñ -O, еÑли вывод " "производитÑÑ Ð² обычный файл.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2930,42 +2900,42 @@ msgstr "" "Параметр --convert-links или --convert-file-only может иÑпользовать вмеÑте " "только, еÑли вывод производитÑÑ Ð² обычный файл.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Сбой при инициализации libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Сбой при инициализации канала c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ðе удалоÑÑŒ разобрать IP-Ð°Ð´Ñ€ÐµÑ Â«%s»\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ðе удалоÑÑŒ назначить DNS-Ñервер(Ñ‹) «%s» (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Ðе найдены URL-Ñ‹ в файле %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе удалоÑÑŒ обработать файл metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðевозможно Ñкачать вÑе реÑурÑÑ‹ Ñ %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2976,7 +2946,7 @@ msgstr "" "Общее времÑ: %s\n" "Загружено: %d файлов, %s за %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ПРЕВЫШЕÐО ограничение на загрузку (%s)!\n" @@ -3132,107 +3102,107 @@ msgstr "Файл %s получен, но подпиÑÑŒ не Ñовпадает. msgid "Renaming %s to %s.\n" msgstr "Переименование %s в %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Работа продолжаетÑÑ Ð² фоновом режиме.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Работа продолжаетÑÑ Ð² фоновом режиме, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Выходные данные будут запиÑаны в %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "ошибка в fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "ошибка в fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ðевозможно найти подходÑщий драйвер Ñокета.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Ошибка в ioctl(). Ðе удалоÑÑŒ уÑтановить блокировку на Ñокет.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: предупреждение: перед именем каждой машины вÑтречаетÑÑ Ð¼Ð°Ñ€ÐºÐµÑ€ %s\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: неизвеÑтный маркер «%s»\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ИÑпользование: %s NETRC [ИМЯ_УЗЛÐ]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: невозможно выполнить stat Ð´Ð»Ñ %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "ПРЕДУПРЕЖДЕÐИЕ: иÑпользуетÑÑ Ñлабый иÑточник Ñлучайных данных.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Ðевозможно породить PRNG; подразумеваетÑÑ Ð¸Ñпользование параметра --random-" "file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ OpenSSL Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ OpenSSL Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: значение %d параметра «secure-protocol» не реализовано\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: невозможно проверить Ñертификат %s, выпущенный %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðевозможно локально проверить подлинноÑÑ‚ÑŒ запрашивающего.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Обнаружен ÑамоÑтоÑтельно подпиÑанный Ñертификат.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Запрошенный Ñертификат ещё недейÑтвителен.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Ð”Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ Ñертификата иÑтёк Ñрок дейÑтвиÑ.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3241,7 +3211,7 @@ msgstr "" "%s: альтернативное Ð¸Ð¼Ñ Ñубъекта Ñертификата не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼\n" "запрошенного узла %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3249,7 +3219,7 @@ msgstr "" " %s: Общее название Ñертификата %s не Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ запрошенного " "узла %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3260,14 +3230,14 @@ msgstr "" " Это может указывать на то, что узел не тот, за кого ÑÐµÐ±Ñ Ð²Ñ‹Ð´Ð°Ñ‘Ñ‚\n" " (то еÑÑ‚ÑŒ не наÑтоÑщий %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Ð”Ð»Ñ Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°Ñного Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº %s иÑпользуйте параметр «--no-check-" "certificate».\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3276,28 +3246,28 @@ msgstr "" "\n" "%*s[ пропуÑкаетÑÑ %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ dot-ÑÑ‚Ð¸Ð»Ñ Â«%s»; оÑтавлен без изменениÑ.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " оÑÑ‚ %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " за " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ REALTIME-чаÑтоту чаÑов: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "УдалÑетÑÑ %s, Ñ‚. к. он должен быть иÑключён.\n" @@ -3311,22 +3281,22 @@ msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "ЗагружаетÑÑ robots.txt; не обращайте внимание на ошибки.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Ошибка разбора URL прокÑи %s: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Ошибка в URL прокÑи %s: Должен быть HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Превышено чиÑло перенаправлений %d.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3334,7 +3304,7 @@ msgstr "" "Завершение.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3342,125 +3312,125 @@ msgstr "" "Повтор.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ðет ошибок" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ñхема %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "ОтÑутÑтвует Ñхема" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ñервера" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ðеверный номер порта" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Ðезавершённые чиÑловые адреÑа IPv6" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "ÐдреÑа IPv6 не поддерживаютÑÑ" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "ÐедопуÑтимый чиÑловой Ð°Ð´Ñ€ÐµÑ IPv6" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Программа Ñкомпилирована без поддержки HTTPS" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ð’Ñтречена Ð½ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ð¸Ð»Ð¸ недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Ðе удалоÑÑŒ выделить доÑтаточно памÑти; нехватка памÑти.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: не удалоÑÑŒ выделить %ld байт; недоÑтаточно памÑти.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: текÑтовый буфер Ñлишком велик (%d байт), оÑтанов.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Работа продолжаетÑÑ Ð² фоновом режиме, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðе удалоÑÑŒ разорвать Ñимвольную ÑÑылку %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Сбой при инициализации libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Ðе удалоÑÑŒ разобрать IP-Ð°Ð´Ñ€ÐµÑ Â«%s»\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Ðе удалоÑÑŒ назначить права Ð´Ð»Ñ %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "ÐедопуÑтимое регулÑрное выражение %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Ошибка при Ñравнении %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3549,6 +3519,24 @@ msgstr "" "Ðайдено единÑтвенное Ñовпадение в файле CDX. СохранÑем переÑмотренную запиÑÑŒ " "в WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «--%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: нераÑпознанный параметр «--%s»\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: параметр «-W %s» неоднозначен\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ «-W %s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Файл «%s» уже ÑущеÑтвует; не загружаетÑÑ.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/sk.gmo b/po/sk.gmo index 15006ee..e7c6978 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index fdbe0b1..6873e4f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-18 22:36+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -19,7 +19,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Neznáma systémová chyba" @@ -27,7 +27,7 @@ msgstr "Neznáma systémová chyba" msgid "Address family for hostname not supported" msgstr "Rodina adries pre hostiteľa nie je podporovaná" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "DoÄasné zlyhanie pri prevode názvu" @@ -95,70 +95,45 @@ msgstr "PreruÅ¡enie signálom" msgid "Parameter string not correctly encoded" msgstr "ReÅ¥azec parametra nie je správne zakódovaný" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Neznáma chyba" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: voľba '%s' je nejednoznaÄná, možnosti:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: voľba '%s' je nejednoznaÄná\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: voľba '--%s' nepodporuje parameter\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: voľba '%s' je nejednoznaÄná, možnosti:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neznáma voľba '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: voľba '%c%s' nepodporuje parameter\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: voľba '--%s' vyžaduje parameter\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neznáma voľba '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neznáma voľba '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neplatná voľba -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: voľba vyžaduje parameter -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: voľba '-W %s' je nejednoznaÄná\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: voľba '-W %s' nepodporuje parameter\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: voľba '-W %s' vyžaduje parameter\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -178,13 +153,13 @@ msgstr "%s: voľba '-W %s' vyžaduje parameter\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -256,28 +231,28 @@ msgstr "Regulárny výraz príliÅ¡ veľký" msgid "Unmatched ) or \\)" msgstr "Nepárové ) alebo \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Bez predchádzajúceho regulárneho výraz" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "nepodarilo sa vytvoriÅ¥ dátovod" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "podproces %s zlyhal" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle zlyhalo" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "nie je možné obnoviÅ¥ fd %d: dup2 zlyhalo" @@ -296,52 +271,52 @@ msgstr "podproces %s dostal závažný signál %d" msgid "memory exhausted" msgstr "pamäť vyÄerpaná" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: nepodarilo sa previesÅ¥ adresu zviazania %s; deaktivujem zviazanie.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Pripájanie k %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Pripájanie k %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Pripájanie k [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "zlyhalo setsockopt SO_RCVBUF: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "pripojené.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "zlyhalo: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: nepodarilo sa previesÅ¥ adresu hostiteľa %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "zlyhalo setsockopt SO_REUSEADDR: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "PríliÅ¡ veľa otvorených fd. Nie je možné použiÅ¥ select na fd >= %d\n" @@ -375,174 +350,174 @@ msgstr "Nepodarilo sa zmazaÅ¥ %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Nie je možné zálohovaÅ¥ %s ako %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Nepodarilo sa získaÅ¥ koláÄik pre %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Chyba syntaxe v Set-Cookie: %s na pozícii %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "KoláÄiky prichádzajúce z %s sa pokúsili nastaviÅ¥ doménu na " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Nie je možné otvoriÅ¥ súbor s koláÄikmi %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Chyba pri zápise do %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Chyba pri zatváraní %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Nepodporovaný typ výpisu, skúša sa unixový parser.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Obsah /%s na %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Äas neznámy " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Súbor " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Adresár " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Sym. odkaz " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Nie je isté" -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtov)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Dĺžka: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", ostáva %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", ostáva %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (nie je smerodajné)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Nepodarilo sa inicializovaÅ¥ SSL. Bude deaktivované." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Prihlasovanie ako %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Server odpovedal chybne, riadiace spojenie sa uzatvára.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Úvodná odpoveÄ servera je chybná.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Zápis dát zlyhal, riadiace spojenie sa uzatvára.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Server odmieta prihlásenie.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Chyba pri prihlásení.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Prihlásený!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Server neakceptoval príkaz 'PBSZ 0'.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Server neakceptoval príkaz 'PROT %c'.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Chyba servera, nie je možné zistiÅ¥ typ systému.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "hotovo. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "hotovo.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Neznámy typ `%c', riadiace spojenie sa uzatvára.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "hotovo." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD nie je potrebné.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Dosiahnutá logicky nemožná ÄasÅ¥ v getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -553,7 +528,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -562,37 +537,37 @@ msgstr "" "Adresár %s neexistuje.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD nie je potrebné.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Súbor už bol prenesený.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Nie je možné iniciovaÅ¥ prenos príkazom PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Nie je možné analyzovaÅ¥ odpoveÄ na PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "nepodarilo sa pripojiÅ¥ k %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Chyba pri operácii \"bind\" (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Neplatný PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -600,17 +575,17 @@ msgstr "" "\n" "REST zlyhal, zaÄína sa odznova.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Súbor %s existuje.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Súbor %s neexistuje.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -619,7 +594,7 @@ msgstr "" "Súbor %s neexistuje.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -628,40 +603,40 @@ msgstr "" "Súbor alebo adresár %s neexistuje.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s bol odpružený do existencie.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, riadiace spojenie sa uzatvára.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Dátové spojenie: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Riadiace spojenie uzatvorené.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Prenos dát bol predÄasne ukonÄený.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Súbor %s je už tam, nebude sa prenášaÅ¥.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(pokus:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -670,7 +645,7 @@ msgstr "" "%s (%s) - zapísané na Å¡tandardný výstup %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -679,33 +654,33 @@ msgstr "" "%s (%s) - %s uložený [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Odstraňuje sa %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "PoužiÅ¥ %s ako doÄasný súbor zoznamu.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Odstránené %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Hĺbka rekurzie %d prekroÄila maximálnu hĺbku %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Vzdialený súbor nie je novší ako miestny súbor %s -- neprenáša sa.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -714,7 +689,7 @@ msgstr "" "Vzdialený súbor je novší ako miestny súbor %s -- prenáša sa.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -723,11 +698,11 @@ msgstr "" "Veľkosti se nezhodujú (miestny %s) -- prenáša sa.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Neplatný názov symoblického odkazu, preskakuje sa.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -736,251 +711,251 @@ msgstr "" "Korektný symbolický odkaz %s -> %s už existuje.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Vytvára sa symbolický odkaz %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Symbolické odkazy nie sú podporované, preskakuje sa symbolický odkaz %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Preskakuje sa adresár %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: neznámy/nepodporovaný typ súboru.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: Äasové znaÄka súboru je poruÅ¡ená.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Nebudú sa prenášaÅ¥ adresáre, pretože hĺbka je %d (maximum je %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Nezostupuje sa do %s, pretože je vylúÄený/nezaÄlenený.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Odmieta sa %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Chyba pri hľadaní zhody %s s %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Vzoru %s niÄ nezodpovedá.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Výpis adresára v HTML formáte bol zapísaný do %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Výpis adresára v HTML formáte bol zapísaný do %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "CHYBA: Nie je možné otvoriÅ¥ adresár %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "CHYBA: Otvorenie certifikátu %s zlyhalo: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "NaÄítaný CA certifikát '%s'\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "CHYBA: NaÄítanie CRL súboru '%s' zlyhalo: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "NaÄítaný CRL súbor '%s'\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "CHYBA: GnuTLS vyžaduje, aby kÄ¾ÃºÄ a certifikát boli rovnakého typu.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: neimplementovaná hodnota %d voľby 'secure-protocol'\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Oznámte, prosím, tento problém na bug-wget@gnu.org (iba anglicky)\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: neimplementovaná hodnota %d voľby 'secure-protocol'\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "CHYBA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "UPOZORNENIE" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s neprezentoval certifikát.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikát %s nie je dôveryhodný.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certifikát %s nedostal známeho vydavateľa.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikát %s bol zruÅ¡ený.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Ten, kto podpísal %s, nebol CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Certifikát %s bol podpísaný pomocou algoritmu, ktorý nie je bezpeÄný.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certifikát %s eÅ¡te nie je aktivovaný.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikátu %s vyprÅ¡ala platnosÅ¥.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Chyba pri inicializácii certifikátu X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Certifikát nenájdený\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Chyba pri analýze certifikátu: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certifikát eÅ¡te nebol aktivovaný\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certifikátu vyprÅ¡ala platnosÅ¥\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Majiteľ certifikátu sa nezhoduje s názvom hostiteľa %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Verejný kÄ¾ÃºÄ sa nezhoduje so zadaným verejným kľúÄom!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certifikát musí byÅ¥ X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Chyba pri spracovaní zoznamu adries.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Neznámy hostiteľ" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Prevádza sa %s na IP adresu... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "zlyhalo: Hostiteľ nemá IPv4/IPv6 adresy.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "zlyhalo: Äasový limit vyprÅ¡al.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Nie je možné rozložiÅ¥ neúplný odkaz %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Neplatné URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Požiadavku HTTP nebolo možné odoslaÅ¥: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Bez hlaviÄiek, predpokladá sa HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "Súbor %s je už tam, nebude sa prenášaÅ¥.\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime zlyhalo. Toto je pravdepodobne programátorská chyba.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -988,55 +963,55 @@ msgstr "" "Nemožno previesÅ¥ Äasovú znaÄku do formátu http. Použije sa Äas 0 ako Äas " "poslednej zmeny.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Chýba BODY dátový súbor %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Použije sa existujúce spojenie s [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Použije sa existujúce spojenie s %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Zlyhalo Äítanie odpovede z proxy: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s CHYBA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "OdpoveÄ servera má skomolený stavový riadok" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tunelovanie proxy zlyhalo: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Neznámy spôsob autentifikácie.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Vybraná autentifikácia: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Ukladá sa do: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1045,63 +1020,63 @@ msgstr "" "Pri sÅ¥ahovaní podpisu:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Nie je možné preÄítaÅ¥ obsah podpisu z doÄasného súboru. Preskakuje sa.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Nepodarilo sa vytvoriÅ¥ doÄasný súbor. Preskakuje sa sÅ¥ahovanie podpisu.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Neplatná hodnota pri. Predpoklá sa %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "Nepodarilo sa nájsÅ¥ prijateľný kontrolný súÄet pre zdroje Metalink.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Deaktivuje sa SSL z dôvodu výskytu chýb.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s požiadavka odoslaná, Äakám na odpoveÄ... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Neboli prijaté žiadne dáta.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Chyba (%s) pri Äítaní hlaviÄiek.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(bez popisu)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Presmerované na: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "neudané" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [nasledované]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1110,7 +1085,7 @@ msgstr "" "Súbor %s nezmenený na serveri. SÅ¥ahovanie vynechané.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1121,7 +1096,7 @@ msgstr "" "Mohli by ste chcieÅ¥ pridaÅ¥ voľbu --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1131,58 +1106,58 @@ msgstr "" " Tento súbor je už kompletne prenesený; netreba niÄ robiÅ¥.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Dĺžka: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorované" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Upozornenie: HTTP nepodporuje žolíkové znaky.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Povolený režim pavúka. Skontrolujte, Äi vzdialený súbor existuje.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Nie je možné zapísaÅ¥ do %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Prijatá hlaviÄka neobsahuje povinný atribút.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Zlyhalo overenie používateľa/hesla.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Nie je možné zapísaÅ¥ do súboru WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Nie je možné zapísaÅ¥ do doÄasného súboru WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Nepodarilo sa nadviazaÅ¥ SSL spojenie.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Nie je možné odstrániÅ¥ %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "CHYBA: Presmerovanie (%d) bez udanej novej adresy.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1190,23 +1165,23 @@ msgstr "" "Nepodarilo sa v HTTP odpovedi nájsÅ¥ dáta Metalink. Súbor sa sÅ¥ahuje pomocou " "HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Nájdené hlaviÄky Metalink. Prepnutie do režimu Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Vzdialený súbor neexistuje -- poÅ¡kodený odkaz!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "HlaviÄka Last-modified chýba -- nebudú sa používaÅ¥ Äasové znaÄky.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "HlaviÄka Last-modified je neplatná -- Äasové znaÄky ignorované.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1215,16 +1190,16 @@ msgstr "" "Súbor na serveri nie je novší ako miestny súbor %s -- neprenáša sa.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Veľkosti se nezhodujú (miestny %s) -- prenáša sa.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Vzdialený súbor je novší, prenáša sa.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1234,7 +1209,7 @@ msgstr "" "prenáša sa.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1242,7 +1217,7 @@ msgstr "" "Vzdialený súbor, ale neobsahuje žiadne odkazy -- neprenáša sa.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1252,7 +1227,7 @@ msgstr "" "ale rekurzia nie je povolená -- neprenáša sa.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1260,12 +1235,12 @@ msgstr "" "Vzdialený súbor existuje.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1274,7 +1249,7 @@ msgstr "" "%s (%s) - zapísané na Å¡tandardný výstup %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1283,58 +1258,58 @@ msgstr "" "%s (%s) - %s uložené [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Spojenie uzatvorené na bajte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Chyba pri Äítaní na bajte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Chyba pri Äítaní na bajte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Nepodporovaná kvalita ochrany '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodporovaný algoritmus '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ukazuje na %s a ten neexistuje.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Nie je možné preÄítaÅ¥ %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Chyba v %s na riadku %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Chyba syntaxe v %s na riadku %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Neznámy príkaz %s v %s na riadku %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1345,7 +1320,7 @@ msgstr "" "Prosím, skontrolujte '%s',\n" "alebo zadajte iný súbor pomocou --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1356,48 +1331,48 @@ msgstr "" "'%s',\n" "alebo zadajte iný súbor pomocou --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Upozornenie: Systémový aj používateľov súbor wgetrc úkazujú na %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neplatný príkaz --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Neplatná logická hodnota %s; použite `on' alebo `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Neplatné %s; použite `on', `off' alebo `quiet'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neplatné Äíslo %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s musí byÅ¥ použité len raz\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neplatná hodnota bajtu %s.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neplatný Äasový interval %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1406,28 +1381,28 @@ msgstr "" "use-askpass vyžaduje reÅ¥azec alebo nastavenú premennú prostredia " "WGET_ASKPASS alebo SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neplatná hodnota %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neplatná hlaviÄka %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neplatná WARC hlaviÄka %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neplatný typ postupu %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1436,40 +1411,40 @@ msgstr "" "%s: %s: Neplatné obmedzenie %s,\n" " použite [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kódovanie %s nie je platné\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konverzia z %s na %s nie je podporovaná\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Vyskytla sa nekompletná alebo neplatná viacbajtová postupnosÅ¥\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Nespracované errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: národné prostredie je nenastavené\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode zlyhalo (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Zlyhala konverzia na malé: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1478,17 +1453,17 @@ msgstr "" "\n" "Výstup sa presmerováva do %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; protokolovaniei sa vypína.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Použitie: %s [VOĽBA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1496,59 +1471,59 @@ msgstr "" "Parametre povinné pri dlhých voľbách sú povinné aj pre skrátené voľby.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Spustenie:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version zobraziÅ¥ verziu programu Wget a skonÄiÅ¥\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help vytlaÄiÅ¥ túto pomoc\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background prejsÅ¥ do pozadia po spustení\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=PRÃKAZ vykonaÅ¥ príkaz Å¡týlu .wgetrc\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Zaznamenávanie a vstupný súbor:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=SÚBOR zaznamenaÅ¥ správy do SÚBORu\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=SÚBOR pridaÅ¥ správy do SÚBORu\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug vytlaÄiÅ¥ množstvo ladiacich informácií\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug vytlaÄiÅ¥ ladiaci výstup Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet potichu (bez výstupu)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose byÅ¥ rozvláÄny (toto je Å¡tandard)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1556,7 +1531,7 @@ msgstr "" " -nv, --no-verbose vypnúť rozvláÄnosÅ¥ bez toho, aby bolo " "ticho\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1564,7 +1539,7 @@ msgstr "" " --report-speed=TYP vypisovaÅ¥ šírku pásma ako TYP. TYP môže " "byÅ¥ `bits'\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1573,7 +1548,7 @@ msgstr "" "miestnom\n" " alebo externom SÚBORe\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1581,11 +1556,11 @@ msgstr "" " --input-metalink=SÚBOR stiahnuÅ¥ súbory zahrnuté v miestnom " "Metalink SÚBORe\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html spracovaÅ¥ vstupný súbor ako HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1594,28 +1569,28 @@ msgstr "" "-F)\n" " relatívne k URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=SÚBOR urÄiÅ¥, ktorý konfiguraÄný súbor použiÅ¥\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config nenaÄítaÅ¥ žiaden konfiguraÄný súbor\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=SÚBOR zaznamenaÅ¥ dôvody pre odmietnutie URL do " "SÚBORu\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "SÅ¥ahovanie:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1623,18 +1598,18 @@ msgstr "" " -t, --tries=ÄŒÃSLO nastaviÅ¥ poÄet opakovaní na ÄŒÃSLO (0 " "neobmedzene)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused pokúsiÅ¥ sa znova, aj keÄ bolo spojenie " "odmietnuté\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=SÚBOR zapísaÅ¥ dokumenty do SÚBORu\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1643,7 +1618,7 @@ msgstr "" " do existujúcich súborov (prepísali " "ich)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1651,7 +1626,7 @@ msgid "" msgstr "" " --no-config nenaÄítaÅ¥ žiaden konfiguraÄný súbor\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1659,7 +1634,7 @@ msgstr "" " -c, --continue obnoviÅ¥ získavanie ÄiastoÄne stiahnutého " "súboru\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1667,11 +1642,11 @@ msgstr "" " --start-pos=POSUV zaÄaÅ¥ sÅ¥ahovanie od pozície POSUV (zaÄína " "nulou)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYP zvoliÅ¥ typ zobrazenia postupu\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1679,7 +1654,7 @@ msgstr "" " --show-progress zobraziÅ¥ liÅ¡tu postupu v každom režime " "rozvláÄnosti\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1689,7 +1664,7 @@ msgstr "" "novÅ¡ie\n" " ako miestne\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1700,7 +1675,7 @@ msgstr "" " if-modified-since v režime oznaÄovania\n" " Äasovými znaÄkami\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1709,21 +1684,21 @@ msgstr "" "súborov\n" " podľa toho ako sú na serveri\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response vytlaÄiÅ¥ odpoveÄ servera\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider nesÅ¥ahovaÅ¥ niÄ\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDY nastaviÅ¥ vÅ¡etky hodnoty Äasových limitov " "na SEKUNDY\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1731,7 +1706,7 @@ msgstr "" " --dns-servers=ADRESY zoznam DNS serverov, na ktoré posielaÅ¥ " "požiadavky (oddelené Äiarkou)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1739,28 +1714,28 @@ msgstr "" " --bind-dns-address=ADRESA zviazaÅ¥ DNS resolver s ADRESOU (názov " "hostiteľa alebo IP) na miestnom hostiteľovi\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNDY nastaviÅ¥ Äasový limit DNS vyhľadávania na " "SEKUNDY\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEKUNDY nastaviÅ¥ Äasový limit spojenia na " "SEKUNDY\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SEKUNDY nastaviÅ¥ Äasový limit Äítania na SEKUNDY\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDY poÄkaÅ¥ SEKUNDY medzi sÅ¥ahovaniami\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1768,7 +1743,7 @@ msgstr "" " --waitretry=SEKÚND poÄkaÅ¥ 1..SEKÚND medzi pokusmi o " "sÅ¥ahovanie\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1777,16 +1752,16 @@ msgstr "" "sekúnd medzi\n" " sÅ¥ahovaniami\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy explicitne vypnúť proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ÄŒÃSLO nastaviÅ¥ limit sÅ¥ahovania na ÄŒÃSLO\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1794,18 +1769,18 @@ msgstr "" " --bind-address=ADRESA zviazaÅ¥ s ADRESOU (názov hostiteľa alebo " "IP) na miestnom hostiteľovi\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=RÃCHLOSŤ obmedziÅ¥ rýchlosÅ¥ sÅ¥ahovania na RÃCHLOSŤ\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache zakázaÅ¥ doÄasné ukladanie DNS " "vyhľadávania\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1813,7 +1788,7 @@ msgstr "" " --restrict-file-names=OS obmedziÅ¥ znaky v názvoch súborov na tie, " "ktoré povoľuje OS\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1821,15 +1796,15 @@ msgstr "" " --ignore-case ignorovaÅ¥ veľkosÅ¥ písmen pri porovnávaní " "súborov/adresárov\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only pripájaÅ¥ sa len na adresy IPv4\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only pripájaÅ¥ sa len na adresy IPv6\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1839,23 +1814,23 @@ msgstr "" "rodiny,\n" " jedno z IPv6, IPv4 alebo none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=POUŽÃVATEĽ nastaviÅ¥ ftp a http používateľov na " "POUŽÃVATEĽ\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=HESLO nastaviÅ¥ ftp a http heslo na HESLO\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password pýtaÅ¥ sa na heslá\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1873,28 +1848,28 @@ msgstr "" "prostredia \n" " WGET_ASKPASS alebo SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri vypnúť podporu IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KÓD použiÅ¥ KÓD ako miestne kódovanie pre IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KÓD použiÅ¥ KÓD ako predvolené vzdialené " "kódovanie\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink odstrániÅ¥ súbor pred Äistením\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1902,7 +1877,7 @@ msgstr "" " --keep-badhash ponechaÅ¥ súbory s nesúhlasiacim " "kontrolným súÄtom (pridaÅ¥ .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1910,7 +1885,7 @@ msgstr "" " --metalink-index=ÄŒÃSLO Poradové ÄŒÃSLO metaurl Metalink " "application/metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1918,7 +1893,7 @@ msgstr "" " --metalink-over-http použiÅ¥ metadáta Metalink z hlaviÄiek " "odpovede HTTP\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1926,7 +1901,7 @@ msgstr "" " --preferred-location uprednostňované umiestnenie pre zdroje " "Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1934,32 +1909,32 @@ msgstr "" " --no-xattr vypnúť ukladanie metaúdajov v rozšírených " "príznakoch súborov\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Adresáre:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories nevytváraÅ¥ adresáre\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vynútiÅ¥ vytváranie adresárov\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories nevytváraÅ¥ adresáre hostiteľa\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories použiÅ¥ názov protokolu v adresároch\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREDP uložiÅ¥ súbory do PREDP/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1967,26 +1942,26 @@ msgstr "" " --cur-dirs=POÄŒET ignorovaÅ¥ POÄŒET vzdialených Äastí názvu " "adresára\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP voľby:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=POUŽÃVATEĽ nastaviÅ¥ http používateľa na POUŽÃVATEĽ\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=HESLO nastaviÅ¥ http heslo na HESLO\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache nepovoliÅ¥ doÄasne uložené dáta na " "serveri\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1995,7 +1970,7 @@ msgstr "" "(Å¡tandardne\n" " je to `index.html'.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2003,42 +1978,42 @@ msgstr "" " -E, --html-extension uložiÅ¥ HTML/CSS dokumenty so správnou " "príponou\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorovaÅ¥ pole 'Content-Length' v " "hlaviÄke\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=REŤAZEC vložiÅ¥ REŤAZEC do hlaviÄky\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYP zvoliÅ¥ typ zobrazenia postupu\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximum povolených presmerovaní na " "stránku\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=POUŽÃVATEĽ nastaviÅ¥ POUŽÃVATEĽa ako používateľa " "proxy\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=HESLO nastaviÅ¥ HESLO ako heslo proxy\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2046,11 +2021,11 @@ msgstr "" " --referer=URL zahrnúť hlaviÄku 'Referer: URL' do HTTP " "požiadavky\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers uložiÅ¥ HTTP hlaviÄky do súboru\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2058,7 +2033,7 @@ msgstr "" " -U, --user-agent=AGENT identifikovaÅ¥ sa ako AGENT namiesto Wget/" "VERZIA\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2066,22 +2041,22 @@ msgstr "" " --no-http-keep-alive zakázaÅ¥ HTTP keep-alive (trvalé " "spojenia)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies nepoužívaÅ¥ koláÄiky\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=SÚBOR pre sedením naÄítaÅ¥ koláÄiky zo SÚBORu\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=SÚBOR po sedení uložiÅ¥ koláÄiky do SÚBORu\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2089,7 +2064,7 @@ msgstr "" " --keep-session-cookies naÄítaÅ¥ a uložiÅ¥ koláÄiky sedenia (nie " "trvalé)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2097,21 +2072,21 @@ msgstr "" " --post-data=REŤAZEC použiÅ¥ POST metódu; poslaÅ¥ REŤAZEC ako " "dáta\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=SÚBOR použiÅ¥ POST metódu; poslaÅ¥ obsah SÚBORu\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPmetóda použiÅ¥ metódu \"HTTPmetóda\" v " "požiadavke\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2119,7 +2094,7 @@ msgstr "" " --body-data=REŤAZEC poslaÅ¥ REŤAZEC ako dáta. --method MUSà " "byÅ¥ nastavené\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2127,7 +2102,7 @@ msgstr "" " --body-file=SÚBOR poslaÅ¥ obsah SÚBORu. --method MUSà byÅ¥ " "nastavené\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2138,7 +2113,7 @@ msgstr "" " voľbe miestnych názvov súborov\n" " (EXPERIMENTÃLNE)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2146,7 +2121,7 @@ msgstr "" " --content-on-error vypisovaÅ¥ prijatý obsah pri chybách " "servera\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2158,11 +2133,11 @@ msgstr "" " HTTP bez poÄiatoÄného Äakania na výzvu " "servera\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Voľby HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2173,40 +2148,40 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 alebo PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --htttps-only nasledovaÅ¥ len bezpeÄné HTTPS odkazy\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate neoverovaÅ¥ certifikát servera\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=SÚBOR súbor certifikátu klienta\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYP typ certifikátu klienta, PEM alebo DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=SÚBOR súbor súkromného kľúÄa\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYP typ súkromného kľúÄa, PEM alebo DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=SÚBOR súbor s balíkom CA\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2214,11 +2189,11 @@ msgstr "" " --ca-directory=ADR adresár, kde je uložený haÅ¡ovaný zoznam " "CA\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=SÚBOR súbor s balíkom CRL\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2235,7 +2210,7 @@ msgstr "" "ktorých sa bude\n" " overovaÅ¥ protistrana\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2243,7 +2218,7 @@ msgstr "" " --random-file=SÚBOR súbor s náhodnými dátami, pre spustenie " "SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2251,15 +2226,15 @@ msgstr "" " --egd-file=SÚBOR súbor s pomenovaním EGD soketu s " "náhodnými dátami\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS voľby:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts zakázaÅ¥ HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2267,11 +2242,11 @@ msgstr "" " --hsts-file cesta k databáze HSTS (nahradí " "predvolenú)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP voľby:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2279,37 +2254,37 @@ msgstr "" " --ftp-stmlf použiÅ¥ formát Stream_LF pre vÅ¡etky " "binárne súbory FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=POUŽÃVATEĽ nastaviÅ¥ ftp používateľa na POUŽÃVATEĽ\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=HESLO nastaviÅ¥ ftp heslo na HESLO\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing neodstraňovaÅ¥ súbory '.listing'\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob pri FTP vypnúť používanie divokých znakov " "v názvoch súborov\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp zakázaÅ¥ \"pasívny\" režim prenosu\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions zachovaÅ¥ vzdialené prístupové práva " "súborov\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2317,11 +2292,11 @@ msgstr "" " --retr-symlinks pri rekurzii získaÅ¥ odkazované súbory " "(nie adresáre)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS voľby:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2329,7 +2304,7 @@ msgstr "" " --ftps-implicit použiÅ¥ implicitné FTPS (Å¡tandardný " "port je 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2339,7 +2314,7 @@ msgstr "" "pokraÄovaÅ¥ v SSL/TLS sedení zaÄatom\n" " riadiacim spojením\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2347,7 +2322,7 @@ msgstr "" " --ftps-clear-data-connection Å¡ifrovaÅ¥ len riadiace spojenie; " "vÅ¡etky dáta budú neÅ¡ifrované\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2355,11 +2330,11 @@ msgstr "" " --ftps-fallback-to-ftp vrátiÅ¥ sa k FTP ak FTPS nie je " "podporované na cieľovom serveri\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC voľby:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2367,24 +2342,24 @@ msgstr "" " --warc-file=NÃZOVSÚBORU uložiÅ¥ údaje o požiadavkách/odpovediach " "do súboru .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" " --warc-header=REŤAZEC vložiÅ¥ REŤAZEC do záznamu warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ÄŒÃSLO nastaviÅ¥ maximálnu veľkosÅ¥ WARC súborov " "na ÄŒÃSLO\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx zapísaÅ¥ indexové súbory CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2392,17 +2367,17 @@ msgstr "" " --warc-dedup=NÃZOVSÚBORU neukladaÅ¥ záznamy uvedené v tomto CDX " "súbore\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression nekomprimovaÅ¥ súbory WARC pomocou GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests nepoÄítaÅ¥ kontrolné súÄty SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2410,7 +2385,7 @@ msgstr "" " --no-warc-keep-log neukladaÅ¥ súbor so záznamom do WARC " "záznamu\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2420,15 +2395,15 @@ msgstr "" "vytvorených\n" " WARC zapisovaÄom\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekurzívne sÅ¥ahovanie:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nastaviÅ¥ rekurzívne sÅ¥ahovanie\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2436,7 +2411,7 @@ msgstr "" " -l, --level=ÄŒÃSLO maximálna hĺbka rekurzie (inf alebo 0 pre " "nekoneÄno)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2444,7 +2419,7 @@ msgstr "" " --delete-after odstrániÅ¥ miestne súbory po ich " "stiahnutí\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2454,7 +2429,7 @@ msgstr "" "tak,\n" " aby ukazovaly na miestne súbory\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2462,7 +2437,7 @@ msgstr "" " --convert-file-only previesÅ¥ len súborovú ÄasÅ¥ URL (väÄÅ¡inou " "nazývané aj basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2470,7 +2445,7 @@ msgstr "" " --backups=N pred zapísaním súboru X, zachovaÅ¥ až N " "záložných súborov\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2478,7 +2453,7 @@ msgstr "" " -K, --backup-converted pred konverziou súboru X ho zazálohovaÅ¥ " "ako X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2486,7 +2461,7 @@ msgstr "" " -K, --backup-converted pred konverziou súboru X ho zazálohovaÅ¥ " "ako X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2494,7 +2469,7 @@ msgstr "" " -m, --mirror skratka pre -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2502,7 +2477,7 @@ msgstr "" " -p, --page-requisites získaÅ¥ vÅ¡etky obrázky, atÄ. potrebné pre " "zobrazenie HTML stránky\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2510,11 +2485,11 @@ msgstr "" " --strict-comments zapnúť striktné (SGML) spracovávanie HTML " "komentárov\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekurzívne akceptovanie/odmietnutie:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2522,7 +2497,7 @@ msgstr "" " -A, --accept=ZOZNAM Äiarkou oddelený zoznam akceptovaných " "prípon\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2530,45 +2505,45 @@ msgstr "" " -R, --reject=ZOZNAM Äiarkou oddelený zoznam odmietnutých " "prípon\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGVÃRAZ regulárny výraz pre akceptované URL\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGVÃRAZ regulárny výraz je odmietnuté URL\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYP typ regulárneho výrazu (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYP typ regulárneho výrazu (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=ZOZNAM Äiarkou oddelený zoznam akceptovaných " "domén\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=ZOZNAM Äiarkou oddelený zoznam odmietnutých " "domén\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp nasledovaÅ¥ FTP odkazy z HTML dokumentov\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2576,7 +2551,7 @@ msgstr "" " --follow-tags=ZOZNAM Äiarkou oddelený zoznam nasledovaných " "HTML znaÄiek\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2584,21 +2559,21 @@ msgstr "" " --ignore-tags=ZOZNAM Äiarkou oddelený zoznam ignorovaných HTML " "znaÄiek\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts prejsÅ¥ na cudzích hostiteľov pri " "rekurzii\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative nasledovaÅ¥ len relatívne odkazy\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=ZOZNAM zoznam povolených adresárov\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2608,87 +2583,87 @@ msgstr "" "komponentom\n" " URL presmerovania\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=ZOZNAM zoznam vynechaných adresárov\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent nevystupovaÅ¥ do rodiÄovského adresára\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Správy o chybách a návrhy na vylepÅ¡enie zasielajte na adresu\n" " (iba anglicky); komentáre k slovenskému\n" "prekladu zasielajte na adresu \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, program pre neinteraktívne sÅ¥ahovanie súborov.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Heslo pre používateľa %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Heslo: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Nepodarilo sa vytvoriÅ¥ dátovod\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Chyba pri inicializácii spúšťacích súborových akcií pre use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Chyba pri nastavovaní spúšťacích súborových akcií pre use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Chyba pri Äítaní odpovede príkazu \"%s %s\": %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Meno používateľa pre '%s%s: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Heslo pre '%s%s@%s': " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Národné prostredie: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilácia: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Odkaz: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2697,29 +2672,29 @@ msgstr "" "GNU Wget %s zostavený na %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (prostredie)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (používateľ)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (systém)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2733,7 +2708,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2741,7 +2716,7 @@ msgstr "" "\n" "Pôvodným autorom tohoto programu je Hrvoje NikÅ¡ić \n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Hlásenia o chybách a otázky zasielajte, prosím, na adresu\n" @@ -2749,34 +2724,34 @@ msgstr "" "Komentáre k slovenskému prekladu zasielajte na adresu .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Problém s alokovaním pamäte\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Koniec z dôvodu chyby v %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Príkaz `%s --help' vypíše viac volieb.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: neprípustná voľba -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Podpora ladenia nebola zahrnutá pri zostavovaní. Príznak --debug sa " "ignoruje.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2785,7 +2760,7 @@ msgstr "" "Oboje --no-clobber a --convert-links bolo zadané. Použije sa len --convert-" "links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2794,22 +2769,22 @@ msgstr "" "Oboje --no-clobber a --convert-file-only bolo zadané. Použije sa len --" "convert-links.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Nie je možné byÅ¥ zároveň rozvláÄny aj byÅ¥ ticho.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Nie je možné používaÅ¥ Äasové znaÄky a nemazaÅ¥ pritom staré súbory.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Nie je možné zadaÅ¥ naraz --inet4-only aj --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2821,7 +2796,7 @@ msgstr "" "s -p alebo -r. Podrobnosti nájdete v návode.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2830,7 +2805,7 @@ msgstr "" "UPOZORNENIE: kombinácia -O s -r alebo -p bude znamenaÅ¥, že celý stiahnutý\n" "obsah bude umiestnený do jedného vami zadaného súboru.\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2840,19 +2815,14 @@ msgstr "" "O.\n" "Podrobnosti nájdete v návode.\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Súbor `%s' je už tam, nebudem ho prenášaÅ¥.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "WARC výstup nefunguje s --no-clobber, --no-clobber bude deaktivované.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2861,12 +2831,12 @@ msgstr "" "znaÄkame\n" "bude deaktivované.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC výstup nefunguje so --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2875,7 +2845,7 @@ msgstr "" " WARC výstup nefunguje s --continue alebo --start-pos, tieto budú " "deaktivované.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2883,7 +2853,7 @@ msgstr "" "Kontrolné súÄty nie sú povolené; WARC deduplikácia nenájde duplikátne " "záznamy.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2892,12 +2862,12 @@ msgstr "" " WARC výstup nefunguje s --continue alebo --start-pos, tieto budú " "deaktivované.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Nie je možné zadaÅ¥ naraz --ask-password aj --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2906,17 +2876,17 @@ msgstr "" "Zadanie --start-pos aj --continue je neodporúÄané; --continue bude " "deaktivované.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: chýba URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Nemôžete zadaÅ¥ naraz --post-data aj --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2925,7 +2895,7 @@ msgstr "" "Nemôžete použiÅ¥ --post-data alebo --post-file spolu s --method. --method " "oÄakáva dáta pomocou voľby --body-data a --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2934,17 +2904,17 @@ msgstr "" "Metódu, ktorá sa má použiÅ¥ s --body-data alebo --body-file, musíte zadaÅ¥ " "pomocou --method=HTTPmetóda.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Nemôžete zadaÅ¥ naraz --body-data aj --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Táto verzia nemá podporu pre IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2952,7 +2922,7 @@ msgstr "" "-k alebo -r môže byÅ¥ použité spolu s -O, len ak je výstup do bežného " "súboru.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2961,42 +2931,42 @@ msgstr "" "--convert-links alebo --convert-file-only môžu byÅ¥ použité spolu, len ak je " "výstup do bežného súboru.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Zlyhala inicializácia libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Zlyhala inicializácia kanála c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Zlyhala analýza IP adresy '%s'\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Zlyhalo nastavenie DNS server(ov) '%s' (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "V %s neboli nájdené URL.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Nepodarilo sa analyzovaÅ¥ metalink súbor %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Nepodarilo sa stiahnuÅ¥ vÅ¡etky zdroje z %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3007,7 +2977,7 @@ msgstr "" "Celkový Äas: %s\n" "Stiahnutých: %d súborov, %s za %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Limit objemu stiahnutych dát %s PREKROÄŒENÃ!\n" @@ -3163,105 +3133,105 @@ msgstr "Súbor %s bol získaný, ale podpis nesúhlasí. \n" msgid "Renaming %s to %s.\n" msgstr "Premenováva sa %s na %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "PokraÄovanie v behu na pozadí.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "PokraÄovanie v behu na pozadí, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Výstup bude zapísaný do %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "zlyhalo fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "zlyhalo fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Nepodarilo sa nájsÅ¥ použiteľný ovládaÄ soketov.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Zlyhalo ioctl(). Soket nemohol byÅ¥ nastavený ako blokujúci.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: upozornenie: token %s je uvedený pred akýmkoľvek názvom poÄítaÄa\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznámy token \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Použitie: %s NETRC [NÃZOV_POÄŒÃTAÄŒA]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: volanie `stat %s' skonÄilo s chybou: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "UPOZORNENIE: používané slabé spúšťacie zrnko pre náhodné Äísla.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Nepodarilo sa inicializovaÅ¥ PRNG; zvážte použitie --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "VaÅ¡a verzia OpenSSL je príliÅ¡ stará, aby podporovala TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "VaÅ¡a verzia OpenSSL je príliÅ¡ stará, aby podporovala TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: neimplementovaná hodnota %d voľby 'secure-protocol'\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: nie je možné overiÅ¥ certifikát pre %s, vydaný %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Nie je možné miestne overiÅ¥ autoritu vydavateľa.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Vyskytol sa certifikát podpísaný samým sebou.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Vydaný certifikát je eÅ¡te neplatný.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Vydanému certifikátu vyprÅ¡ala platnosÅ¥.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3270,7 +3240,7 @@ msgstr "" "%s: žiadny alternatívny názov predmetu v certifikáte\n" "\tsa nezhoduje s požadovaným názvom hostiteľa %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3278,7 +3248,7 @@ msgstr "" " %s: bežný názov %s v certifikáte sa nezhoduje s požadovaným názvom " "hostiteľa %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3289,12 +3259,12 @@ msgstr "" " To môže byÅ¥ znamením toho, že hostiteľ nie je tým, za koho sa vydáva\n" " (to znamená, nie je to reálne %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Na nie bezpeÄné pripojenie k %s použite `--no-check-certificate'.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3303,28 +3273,28 @@ msgstr "" "\n" "%*s[ preskakuje sa %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Neplatná bodková Å¡pecifikácia %s; ponecháva sa nezmenené.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " odh %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " za " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Nie je možné získaÅ¥ frekvenciu hodín reálneho Äasu: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Odstraňuje sa %s, pretože by mal byÅ¥ odmietnutý.\n" @@ -3338,22 +3308,22 @@ msgstr "Nie je možné otvoriÅ¥ %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "NaÄítava sa robots.txt. Chybové hlásenia ignorujte, prosím.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Chyba pri analýze proxy URL %s: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Chyba v proxy URL %s: Musí byÅ¥ HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "PrekroÄený limit %d presmerovaní.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3361,7 +3331,7 @@ msgstr "" "Nemá to zmysel.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3369,127 +3339,127 @@ msgstr "" "Skúša sa znova.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Bez chyby" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nepodporovaná schéma %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schéma chýba" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Neplatný názov hostiteľa" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Zlé Äíslo portu" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Neplatné meno používateľa" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "NeukonÄená Äíselná adresa pre IPv6" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adresy nie sú podporované" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Neplatná Äíselná adresa IPv6" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Podpora pre HTTPS nie je zakompilovaná" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Vyskytla sa nekompletná alebo neplatná viacbajtová postupnosÅ¥\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Zlyhalo vyžiadanie dostatoÄnej pamäte; pamäť je vyÄerpaná.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Zlyhalo vyžiadanie %ld bajtov; pamäť je vyÄerpaná.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: pamäť na text je príliÅ¡ veľká (%d bajtov), predÄasne " "ukonÄujem.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "PokraÄovanie v behu na pozadí, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Nebolo možné odstrániÅ¥ symbolický odkaz %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Zlyhala inicializácia libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Zlyhala analýza IP adresy '%s'\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Nastavenie prístupových práv pre %s zlyhalo.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Neplatný regulárny výraz %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Chyba pri hľadaní zhody %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3571,6 +3541,24 @@ msgstr "" "NaÅ¡la sa presná zhoda v súbore CDX. Ukladá sa záznam opätovného navÅ¡tívenia " "do WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: voľba '--%s' nepodporuje parameter\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neznáma voľba '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: voľba '-W %s' je nejednoznaÄná\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: voľba '-W %s' nepodporuje parameter\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: voľba '-W %s' vyžaduje parameter\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Súbor `%s' je už tam, nebudem ho prenášaÅ¥.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/sl.gmo b/po/sl.gmo index 02c7e18..ca6a890 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 4c30f92..f75c1f0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.12-pre7\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2010-11-17 20:05+0100\n" "Last-Translator: Andrej ®nidar¹iè \n" "Language-Team: Slovenian \n" @@ -36,7 +36,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Neznana napaka sistema" @@ -45,7 +45,7 @@ msgstr "Neznana napaka sistema" msgid "Address family for hostname not supported" msgstr "Naslovi IPv6 niso podprti" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Zaèasna napaka med razre¹evanjem imena" @@ -116,70 +116,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Neznana napaka" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: mo¾nost '%s' je dvoumna\n" -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: mo¾nost '%s' je dvoumna\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: mo¾nost '--%s' ne dovoljuje argumenta\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neprepoznana mo¾nost '%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: mo¾nost '%c%s' ne dovoljuje argumenta\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: mo¾nost '--%s' zahteva argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neprepoznana mo¾nost '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neprepoznana mo¾nost '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neveljavna mo¾nost -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: mo¾nost zahteva argument -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: mo¾nost '-W %s' je dvoumna\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: mo¾nost '-W %s' ne dovoljuje argumenta\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: mo¾nost '-W %s' zahteva argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -199,13 +174,13 @@ msgstr "%s: mo #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -281,28 +256,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -321,52 +296,52 @@ msgstr "" msgid "memory exhausted" msgstr "pomnilnik izèrpan" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" "%s: ni bilo mogoèe razre¹iti naslova za vezanje %s; onemogoèanje vezanja.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Povezovanje na %s|%s|:%d ... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Povezovanje na %s:%d ... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "Povezovanje na %s:%d ... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "povezano.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "spodletelo: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: ni bilo mogoèe razre¹iti naslova gostitelja %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -400,175 +375,175 @@ msgstr "Ni bilo mogo msgid "Cannot back up %s as %s: %s\n" msgstr "Ni mogoèe ustvariti varnostne kopije %s kot %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "Ni bilo mogoèe izbrisati %s: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Skladenjska napaka v Set-Cookie: %s na mestu %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Pi¹kot iz %s je sku¹al nastaviti domeno na %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ni bilo mogoèe odpreti datoteke s pi¹kotki %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Napaka med zapisovanjem v %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Napaka med zapiranjem %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Nepodprta vrsta seznama, posku¹am z razèlenjevalnikom seznama za Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Kazalo mape /%s na %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "neznan èas " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Datoteka " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "mapa " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Povezava " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Neznano " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bajtov)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Dol¾ina: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) preostalo" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s preostalo" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (neavtorizirana)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Prijavljanje kot %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Napaka v odzivu stre¾nika, zapiranje nadzorne povezave.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Napaka v pozdravu stre¾nika.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Pisanje je spodletelo, zapiram nadzorno povezavo.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Stre¾nik zavraèa prijavo.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Napaèna prijava.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Prijavljen!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Napaka stre¾nika, vrste sistema ni moè ugotoviti.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "konèano. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "konèano.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Neznana vrsta `%c', zapiranje nadzorne povezave.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "konèano." -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD ni potreben.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -576,7 +551,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -585,37 +560,37 @@ msgstr "" "Ni take mape %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD ni zahtevan.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Datoteka je bila ¾e prejeta.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ni mogoèe zaèeti prenosa PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ni mogoèe razèleniti odgovora PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "ni se bilo moè povezati z %s na vratih %d: %s.\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Napaka med povezovanjem (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Neveljaven PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -623,17 +598,17 @@ msgstr "" "\n" "REST neuspe¹en, zaèenjanje znova.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Datoteka %s obstaja.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Ni take datoteke %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -642,7 +617,7 @@ msgstr "" "Ni take datoteke %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -651,40 +626,40 @@ msgstr "" "Ni take datoteke ali mape %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s je zaèela obstajati.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, zapiranje nadzorne povezave.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Podatkovna zveza: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Nadzorna povezava prekinjena.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Prenos podatkov prekinjen.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Datoteka %s je ¾e tam; prejem preskoèen.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(posk:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -693,7 +668,7 @@ msgstr "" "%s (%s) - zapisan v stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -702,35 +677,35 @@ msgstr "" "%s (%s) - %s shranjeno [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Odstranjevanje %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Uporabljanje %s kot zaèasno datoteko seznama.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Odstranjen %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Globina rekurzije %d presega najveèjo dovoljeno %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Oddaljena datoteka ni novej¹a od krajevne datoteke %s -- prejemanje " "preskoèeno.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -739,7 +714,7 @@ msgstr "" "Oddaljena datoteka je novej¹a kot krajevna datoteka %s -- prejemanje.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -748,11 +723,11 @@ msgstr "" "Velikosti se ne ujemata (krajevna %s) -- prena¹am.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Neveljavno ime simbolne povezave, preskakujem.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -761,239 +736,239 @@ msgstr "" "Pravilna simbolna povezava ¾e obstaja: %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Ustvarjanje simbolne povezave %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Simbolne povezave niso podprte. Simbolna povezava %s bo preskoèena.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Mapa %s bo preskoèena.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: neznana/nepodprta vrsta datoteke.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: okvarjen èasovni ¾ig.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Mape ne bodo pridobljene, ker je globina %d (najveè %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ni padanja k %s, ker je izvzeto/ni vkljuèeno.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Zavraèanje %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Napaka med ujemanjem %s z %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ni ujemanj za vzorec %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Zapisan indeks kot HTML v %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Zapisan indeks kot HTML v %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "NAPAKA: Ni bilo mogoèe odpreti mape %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, fuzzy, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "NAPAKA: Ni bilo mogoèe odpreti mape %s.\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, fuzzy, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Napaka med razèlenjevanjem potrdila: %s\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Po¹ljite poroèila o hro¹èih in vpra¹anja na .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "NAPAKA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "OPOZORILO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s ni podal potrdila.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Potrdilo od %s ni zaupanja vredno.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Potrdilo %s nima znanega izdajatelja.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Potrdilo od %s je bilo preklicano.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Potrdilo od %s ni zaupanja vredno.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, fuzzy, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Potrdilo %s nima znanega izdajatelja.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, fuzzy, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Potrdilo od %s ni zaupanja vredno.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Potrdilo od %s je bilo preklicano.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Napaka med nastavljanjem zaèetnih vrednosti potrdila X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Ni bilo najdenih potrdil\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Napaka med razèlenjevanjem potrdila: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Potrdilo ¹e ni bilo omogoèeno\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Potrdilo je poteklo\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Lastnik potrdila se ne ujema z imenom gostitelja %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Neznan gostitelj" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Razre¹evanje %s ..." -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "spodletelo: Ni naslova IPv4/IPv6 za gostitelja.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "spodletelo: zakasnitev.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ni moè razre¹iti nepopolne povezave %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Neveljaven URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Napaka med pisanjem zahteve HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Ni glav, privzema se HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -1002,133 +977,133 @@ msgstr "" "Datoteka %s je ¾e tam; prejemanje preskoèeno.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "Datoteka s podatki POST, %s, manjka: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ponovna uporaba povezave z %s:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ponovna uporaba povezave z %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Napaka med branjem odgovora posredni¹kega stre¾nika: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s NAPAKA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Izmalièena vrstica stanja" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Tuneliranje posredni¹kega stre¾nika je spodletelo: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Neznata metoda overitve.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "Neznata metoda overitve.\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Shranjevanje v: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Onemogoèanje SSL zaradi opa¾enih napak.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s zahteva poslana, èakanje na odgovor ... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Brez sprejetih podatkov.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Napaka med branjem glav (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(brez opisa)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Polo¾aj: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "nedoloèeno" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [spremljanje]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1136,7 +1111,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1146,82 +1121,82 @@ msgstr "" " Datoteka je ¾e popolnoma prene¹ena; niè ni za storiti.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Dol¾ina: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "prezrto" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Opozorilo: HTTP ne podpira nadomestnih znakov.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Omogoèen naèin pajka. Preverite, èe obstaja oddaljena datoteka.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4381 +#: src/http.c:4406 #, fuzzy msgid "Cannot write to temporary WARC file.\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Povezave SSL ni bilo moè vzpostaviti.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "V %s ni mogoèe zapisovati (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "NAPAKA: Preusmeritev (%d) brez nove lokacije.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Oddaljena datoteka ne obstaja -- pokvarjena povezava!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Glava ,Last-Modified` manjka - izklapljanje èasovnega ¾iga.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Neveljavna glava `Last-Modified' -- prezrtje èasovnega ¾iga.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1231,16 +1206,16 @@ msgstr "" "preskoèeno.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Velikosti se ne ujemata (krajevna %s) -- prena¹anje.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Oddaljena datoteka je novej¹a, pridobivanje.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1250,7 +1225,7 @@ msgstr "" "pridobivanje.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1259,7 +1234,7 @@ msgstr "" "preskoèeno.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1269,7 +1244,7 @@ msgstr "" "povezave, vendar je rekurzija onemogoèena -- prejemanje preskoèeno.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1277,12 +1252,12 @@ msgstr "" "Oddaljena datoteka obstaja.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1291,7 +1266,7 @@ msgstr "" "%s (%s) - zapisano v stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1300,58 +1275,58 @@ msgstr "" "%s (%s) - %s shranjeno [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Povezava zaprta na bajtu %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Napaka med branjem na bajtu %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Napaka med branjem na bajtu %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Nepodprta shema %s" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ka¾e na %s, ki ne obstaja.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ni mogoèe prebrati %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Napaka v %s v vrstici %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Napaka skladnje v %s v vrstici %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Neznan ukaz %s v %s v vrstici %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1359,7 +1334,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1367,77 +1342,77 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Opozorilo: tako sistemska kot uporabnikova datoteka wgetrc ka¾eta na " "%s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Neveljaven --execute command %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Neveljaven logièni operator %s; uporabite `on' ali `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Neveljaven logièni operator %s; uporabite `on' ali `off'.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Neveljavno ¹tevilo %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Neveljavna vrednost bajta %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Neveljavni èasovni razpon %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Neveljavna vrednost %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Neveljavne glave %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Neveljavne glave %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Neveljavna vrsta stanja napredka %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1446,40 +1421,40 @@ msgstr "" "%s: %s: Neveljavna omejitev %s,\n" " uporabite [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodiranje %s ni veljavno\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Pretvorba iz %s v %s ni podprta\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Zaznana je bila nepopolna ali neveljavna veèbajtna sekvenca\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Neobravnavana errno %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: jezikovna oznaka ni nastavljena\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "Spodletel idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "ni se bilo moè povezati z %s na vratih %d: %s.\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1488,17 +1463,17 @@ msgstr "" "\n" "%s prejeto, preusmerjanje izhoda na %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; onemogoèanje bele¾enja.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Uporaba: %s [IZBIRA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1506,81 +1481,81 @@ msgstr "" "Obvezni argumenti za dolge izbire so obvezni tudi za kratke izbire.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Zagon:\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version prika¾i razlièico Wgeta in se vrni.\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help izpi¹i pomoè.\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background po zagonu pojdi v ozadje.\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=UKAZ izvedi ukaz v slogu ,.wgetrc`.\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Bele¾enje in vhodna datoteka:\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=DAT. shranjuj sporoèila v DATOTEKO.\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DAT. pripni sporoèila v DATOTEKO.\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug izpi¹i veliko razhro¹èevalnih podrobnosti.\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug izpi¹i razhro¹èevalni izhod za Watt-32.\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet ti¹ina (brez izpisa).\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose vkljuèi polni izpis (privzeto).\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose izkljuèi veèino izpisa, a brez ti¹ine.\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " @@ -1589,7 +1564,7 @@ msgstr "" " -i, --input-file=DAT. prejmi povezave najdene v krajevni ali zunanji " "DATOTEKI.\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " @@ -1598,12 +1573,12 @@ msgstr "" " -i, --input-file=DAT. prejmi povezave najdene v krajevni ali zunanji " "DATOTEKI.\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html privzemi, da je vhodna datoteka HTML.\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1612,26 +1587,26 @@ msgstr "" " -B, --base=URL Razre¹i povezave HTML input-file (-i -F)\n" " relativno na URL-je.\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Prejemanje:\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " @@ -1639,7 +1614,7 @@ msgid "" msgstr "" " -t, --tries=©TEVILO nastavi ©TEVILO poskusov (0 za neskonèno).\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" @@ -1647,12 +1622,12 @@ msgstr "" " --retry-connrefused znova poskusi, tudi èe je povezava " "zavrnjena.\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=DAT. zapisuj dokumente v DATOTEKO.\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" @@ -1661,14 +1636,14 @@ msgstr "" " -nc, --no-clobber preskoèi prejemanja, ki bi se prepisala\n" " obstojeèe datoteke.\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" +msgstr " -np, --no-parent ne pojdi v nadrejeno mapo.\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " @@ -1677,25 +1652,25 @@ msgstr "" " -c, --continue nadaljuj z prejemanjem delno prejete " "datoteke.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1705,14 +1680,14 @@ msgstr "" " -N, --timestamping ne prejmi znova datotek , ki so\n" " starej¹e od krajevnih.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 #, fuzzy msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" @@ -1722,29 +1697,29 @@ msgstr "" "datotek\n" " glede na èasovne ¾ige na stre¾niku.\n" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response izpi¹i odziv stre¾nika.\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider ne prejmi nièesar.\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SEKUNDE nastavi vse zakasnitve na SEKUNDE.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1753,32 +1728,32 @@ msgstr "" " --bind-address=NASLOV pove¾i se z NASLOVOM (ime ali IP) na \n" " krajevnem gostitelju.\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEKUNDE nastavi zakasnitev poizvedbe DNS na " "SEKUNDE.\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SECS nastavi zakasnitev povezovanja na " "SEKUNDE.\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SECS nastavi zakasnitev branja na SEKUNDE.\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDE poèakaj SEKUND med prejemi.\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1788,7 +1763,7 @@ msgstr "" "poskusi\n" " prejemanja.\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " @@ -1797,19 +1772,19 @@ msgstr "" " --random-wait èakaj od 0.5*ÈAKAJ...1.5*ÈAKAJ sekund med " "prejemi.\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr "" " --no-proxy posebej izkljuèi posredni¹ki stre¾nik.\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=©TEVILO doloèi omejitev prejemanja na ©TEVILO.\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1818,19 +1793,19 @@ msgstr "" " --bind-address=NASLOV pove¾i se z NASLOVOM (ime ali IP) na \n" " krajevnem gostitelju.\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=HITROST omeji hitrost prejemanja na HITROST.\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache onemogoèi predpomnjenje poizvedb DNS.\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1841,7 +1816,7 @@ msgstr "" " so dovoljeni v OS.\n" "\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" @@ -1850,17 +1825,17 @@ msgstr "" " --ignore-case ne upo¹tevaj velikosti èrk med\n" " ujemanjem datotek/map\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only pove¾i se zgolj na naslove IPv4\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only pove¾i se zgolj na naslove IPv6\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1871,25 +1846,25 @@ msgstr "" "dru¾ine,\n" " lahko je IPv6, IPv4, ali none.\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=UPORABNIK nastavi uporabnika za FTP in HTTP na " "UPORABNIK.\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --passwd=GESLO nastavi geslo za FTP in HTTP na GESLO.\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --ask-password vpra¹aj za gesla.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1900,12 +1875,12 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-iri izklopi podpor IRI.\n" -#: src/main.c:714 +#: src/main.c:723 #, fuzzy msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" @@ -1913,7 +1888,7 @@ msgstr "" " --local-encoding=KOD. uporabi KODIRANJE kot krajevno kodiranje " "za IRIs.\n" -#: src/main.c:716 +#: src/main.c:725 #, fuzzy msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" @@ -1921,75 +1896,73 @@ msgstr "" " --remote-encoding=KOD. uporabi KODIRANJE kot privzeto oddaljeno " "kodiranje.\n" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr "" " --no-glob izkljuèi `globbing' imen datotek pri FTP.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -" -Q, --quota=©TEVILO doloèi omejitev prejemanja na ©TEVILO.\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 #, fuzzy msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-iri izklopi podpor IRI.\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Mape:\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories ne ustvari map.\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories vedno ustvari mape.\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ne ustvarjaj map gostiteljev.\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories v mapah uporabi ime protokola.\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREDPONA shranij datoteke v PREDPONA/...\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " @@ -1998,27 +1971,27 @@ msgstr "" " --cut-dirs=©TEVILO prezri ©TEVILO sestavnih delov oddaljenih " "map.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Mo¾nosti HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=UPORABNIK nastavi uporabnika HTTP na UPORABNIK.\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=GESLO nastavi geslo za HTTP na GESLO.\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache onemogoèi predpomnjene podatke s stre¾nika.\n" -#: src/main.c:760 +#: src/main.c:769 #, fuzzy msgid "" " --default-page=NAME change the default page name (normally\n" @@ -2027,7 +2000,7 @@ msgstr "" " --default-page=NAME Spremeni privzeto ime strani (obièajno\n" " je to `index.html'.).\n" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " @@ -2036,46 +2009,46 @@ msgstr "" " -E, --adjust-extension shrani dokumente HTML/CSS s pravilnimi " "priponami.\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length Prezri glavo `Content-Length'.\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=NIZ vstavi NIZ med glave.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:773 +#: src/main.c:782 #, fuzzy msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect najveè dovoljenih preusmeritev na stran.\n" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=UPORABNIK nastavi UPORABNIKA kot uporabni¹ko ime za " "posredni¹ki stre¾nik.\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-passwd=GESLO nastavi GESLO za geslo posredni¹kega " "stre¾nika.\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -2083,12 +2056,12 @@ msgid "" msgstr "" " --referer=URL vkljuèi ,Referer: URL` v zahtevek HTTP.\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers shranjuj glave HTTP v datoteko.\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" @@ -2097,7 +2070,7 @@ msgstr "" " -U, --user-agent=ODJEMNIK predstavi se kot ODJEMNIK namesto Wget/" "RAZLIÈICA.\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " @@ -2105,23 +2078,23 @@ msgid "" msgstr "" " --no-http-keep-alive onemogoèi stalne povezave HTTP (keep-alive).\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=DATOT. pred sejo nalo¾i pi¹kote iz DATOTEKE.\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=DATOT. po seji shrani pi¹kote v DATOTEKO.\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " @@ -2129,7 +2102,7 @@ msgid "" msgstr "" " --keep-session-cookies nalo¾i in shrani (zaèasne) pi¹kote seje.\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " @@ -2137,7 +2110,7 @@ msgid "" msgstr "" " --post-data=NIZ uporabi metodo POST; po¹lji NIZ kot podatke.\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " @@ -2147,12 +2120,12 @@ msgstr "" "DATOTEKE.\n" "\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " @@ -2160,7 +2133,7 @@ msgid "" msgstr "" " --post-data=NIZ uporabi metodo POST; po¹lji NIZ kot podatke.\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " @@ -2170,7 +2143,7 @@ msgstr "" "DATOTEKE.\n" "\n" -#: src/main.c:805 +#: src/main.c:814 #, fuzzy msgid "" " --content-disposition honor the Content-Disposition header " @@ -2181,13 +2154,13 @@ msgstr "" " --content-disposition upo¹tevaj glavo Content-Disposition, ko\n" " izbira¹ lokalna imena datotek (POSKUSNO).\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 #, fuzzy msgid "" " --auth-no-challenge send Basic HTTP authentication " @@ -2199,11 +2172,11 @@ msgstr "" " brez èakanja na stre¾nikov\n" " poziv.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Mo¾nosti HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2213,59 +2186,59 @@ msgstr "" " --secure-protocol izberi varni protokol SSL; lahko je auto,\n" " SSLv2, SSLv3 ali TLSv1\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr "" " -L, --relative spremljaj samo relativne povezave.\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate ne preveri potrdila stre¾nika.\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DAT. DATOTEKA s potrdilom.\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=VRSTA VRSTA potrdila odjemalca, PEM ali DER.\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=DAT. DATOTEKA z zasebnim kljuèem.\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=VRSTA vrsta zasebnega kljuèa, PEM ali DER.\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DAT. datoteka z zbirko CA-jev.\n" -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=MAPA MAPA s seznamom hash CA-jev.\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=DAT. datoteka z zbirko CA-jev.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2275,7 +2248,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2283,7 +2256,7 @@ msgid "" msgstr "" " --random-file=DAT. DATOTEKA z nakljuènim semenom za SSL PRNG.\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " @@ -2291,28 +2264,28 @@ msgid "" msgstr "" " --egd-file=DAT. ime datoteke vtièa EGD z nakljuènimi podatki.\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "Mo¾nosti HTTP:\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr "" " --no-cache onemogoèi predpomnjene podatke s stre¾nika.\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:869 +#: src/main.c:878 #, fuzzy msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " @@ -2321,29 +2294,29 @@ msgstr "" " --ftp-stmlf Uporabi obliko Stream_LF za vse binarne " "datoteke FTP.\n" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=UPORABNIK nastavi uporabni¹ko ime FTP na UPORABNIK.\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-passwd=GESLO nastavi geslo za FTP kot GESLO.\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ne odstrani datotek ,.listing`.\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob izkljuèi `globbing' imen datotek pri FTP.\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" @@ -2351,12 +2324,12 @@ msgstr "" " --no-passive-ftp ne uporabljaj \"pasivnega\" naèina " "prenosa.\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions ohrani oddaljena dovoljenja datotek.\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2365,82 +2338,82 @@ msgstr "" " --retr-symlinks pri rekurziji prejmi ciljne datoteke (ne " "map).\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "Mo¾nosti FTP:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=NIZ vstavi NIZ med glave.\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " -t, --tries=©TEVILO nastavi ©TEVILO poskusov (0 za neskonèno).\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider ne prejmi nièesar.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies ne uporabljaj pi¹kotkov.\n" -#: src/main.c:920 +#: src/main.c:929 #, fuzzy msgid "" " --no-warc-keep-log do not store the log file in a WARC " @@ -2449,23 +2422,23 @@ msgstr "" " --ignore-case ne upo¹tevaj velikosti èrk med\n" " ujemanjem datotek/map\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekurzivno prejemanje:\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive nastavi rekurzivno prejemanje.\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " @@ -2474,7 +2447,7 @@ msgstr "" " -l, --level=©TEVILO najveèja dovoljena globina rekurzije (inf ali 0\n" " za neskonèno).\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " @@ -2482,7 +2455,7 @@ msgid "" msgstr "" " --delete-after izbri¹i krajevne datoteke, ko so prejete.\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2492,19 +2465,19 @@ msgstr "" " -k, --convert-links povezave v prejetih datotekah HTML ali CSS naj\n" " ka¾ejo na krajevne datoteke.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " @@ -2513,7 +2486,7 @@ msgstr "" " -K, --backup-converted pred pretvorbo datoteke X, napravi varnostno " "kopijo kot X_orig.\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." @@ -2522,7 +2495,7 @@ msgstr "" " -K, --backup-converted pred pretvorbo datoteke X ustvari varnostno \n" " kopijo kot X.orig.\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2530,7 +2503,7 @@ msgid "" msgstr "" " -m, --mirror bli¾njica za -N -r -l inf --no-remove-listing.\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " @@ -2540,7 +2513,7 @@ msgstr "" "spletne\n" " strani HTML.\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " @@ -2550,11 +2523,11 @@ msgstr "" "HTML.\n" "\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekurzivno sprejemanje/zavraèanje:\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " @@ -2563,7 +2536,7 @@ msgstr "" " -A, --accept=SEZNAM z vejico loèen seznam sprejemljivih " "pripon.\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " @@ -2572,25 +2545,25 @@ msgstr "" " -R, --reject=SEZNAM z vejico loèen seznam zavrnjenih " "pripon.\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=VRSTA doloèi slog prikaza prejemanja.\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" @@ -2598,21 +2571,21 @@ msgstr "" " -D, --domains=SEZNAM z vejico loèen seznam sprejemljivih " "domen.\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=SEZNAM z vejico loèen seznam zavrnjenih domen.\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp sledi povezavam FTP iz dokumentov HTML.\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " @@ -2621,7 +2594,7 @@ msgstr "" " --follow-tags=SEZNAM z vejico loèen seznam sledenim znaèkam " "HTML.\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " @@ -2630,25 +2603,25 @@ msgstr "" " --ignore-tags=SEZNAM z vejico loèen seznam prezrtih znaèk " "HTML.\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts pri rekurziji pojdi tudi na druge " "gostitelje.\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative spremljaj samo relativne povezave.\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=SEZNAM seznam dovoljenih map.\n" -#: src/main.c:991 +#: src/main.c:1000 #, fuzzy msgid "" " --trust-server-names use the name specified by the " @@ -2658,84 +2631,84 @@ msgstr "" " --trust-server-names uporabi ime doloèeno z zadnjo komponento " "preusmerjevalne povezavet.\n" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=SEZNAM seznam nedovoljenih map.\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ne pojdi v nadrejeno mapo.\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "Po¹iljajte poroèila o hro¹èih in predloge na .\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, neinteraktivno orodje za prejemanje preko mre¾e.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Geslo za uporabnika %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Geslo: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, fuzzy, c-format msgid "Password for '%s%s@%s': " msgstr "Geslo za uporabnika %s: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Jazikovno doloèilo: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Compile: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Povezava: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2744,29 +2717,29 @@ msgstr "" "GNU Wget %s grajen na %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (uporabnik)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistem)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Avtorske pravice (C) 2009 Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2780,7 +2753,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2788,67 +2761,67 @@ msgstr "" "\n" "Izvorni avtor: Hrvoje Nik¹iæ .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Po¹ljite poroèila o hro¹èih in vpra¹anja na .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Poskusite `%s --help' za veè mo¾nosti.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: nedovoljena mo¾nost -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Tihi in izèrpni naèin nista mogoèa istoèasno.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Istoèasno ni mogoèe dodajati èasovnih ¾igov in ne nenamerno prepisovati " "starih datotek.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ni mogoèe hkrati podati --inet4-only in --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 #, fuzzy msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " @@ -2860,7 +2833,7 @@ msgstr "" "v kombinaciji s -p ali -r. Za podrobnosti si oglejte priroènik.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2871,7 +2844,7 @@ msgstr "" "vpisovala v eno samo datoteko, ki ste jo podali.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2882,143 +2855,138 @@ msgstr "" "oglejte priroènik.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Datoteka `%s' ¾e obstaja; prejemanje je preskoèeno.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ni mogoèe doloèiti obeh --ask-password in --password hkrati.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: manjka URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ni mogoèe doloèiti obeh --ask-password in --password hkrati.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ni mogoèe hkrati podati --inet4-only in --inet6-only.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ta razlièica nima podpore za IRIs\n" -#: src/main.c:1951 +#: src/main.c:1960 #, fuzzy, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "-k se lahko uporabi skupaj z -O samo, èe je izhod obièajna datoteka.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, fuzzy, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "-k se lahko uporabi skupaj z -O samo, èe je izhod obièajna datoteka.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, fuzzy, c-format msgid "Failed to init libcares\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, fuzzy, c-format msgid "Failed to parse IP address '%s'\n" msgstr "%s: ni bilo mogoèe razre¹iti naslova gostitelja %s\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "V %s ni najdenega nobenega URL.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ni bilo mogoèe izbrisati %s: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -3028,7 +2996,7 @@ msgstr "" "KONÈANO --%s--\n" "Prejeto: %d datotek, %s v %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Omejitev prejemanja %s je PREKORAÈENA!\n" @@ -3185,106 +3153,106 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "Odstranjevanje %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Nadaljevanje v ozadju.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Nadaljevanje v ozadju, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Izhod bo zapisan v %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ni bilo mogoèe najti uporabnega gonilnika vtièa.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: opozorilo: ¾eton %s se pojavi pred vsakim imenom raèunalnika\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: neznan ¾eton \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Uporaba: %s NETRC [IME GOSTITELJA]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: ni mogoèe napraviti stat na %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "OPOZORILO: uporabljate ¹ibko seme za nakljuèna ¹tevila.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Ni bilo mogoèe ustvariti semena PRNG; razmislite o rabi --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: ni bilo mogoèe preveriti potrdila %s, ki ga je izdal %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Istovetnosti izdajatelja krajevno ni bilo mogoèe preveriti.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Zaznano je bilo samopodpisano potrdilo.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Izdano potrdilo ¹e ni veljavno.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Izdano potrdilo je ¾e poteklo.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3293,7 +3261,7 @@ msgstr "" "%s: ni ujemanj alternativnega imena potrdila\n" "\tzahtevano ime gostitelja %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3301,7 +3269,7 @@ msgstr "" " %s: obièajno ime potrdila %s se ne ujema z zahtevanim imenom gostitelja " "%s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3312,14 +3280,14 @@ msgstr "" " To je morda znamenje, da se gostitelj izdaja za drugega\n" " (to pomeni, da ni pravi %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Èe se ¾elite povezati z %s brez varnosti, uporabite --no-check-" "certificate`.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3328,29 +3296,29 @@ msgstr "" "\n" "%*s[ preskakovanje %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Neveljavno doloèilo sloga pik %s; ostaja nespremenjeno.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, fuzzy, c-format msgid " eta %s" msgstr " pèp %s" -#: src/progress.c:1148 +#: src/progress.c:1147 #, fuzzy msgid " in " msgstr " v " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ni bilo mogoèe dobiti frekvence ure realnega èasa: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Odstranjevanje %s, saj bi moral biti zavrnjen.\n" @@ -3364,22 +3332,22 @@ msgstr "Ni bilo mogo msgid "Loading robots.txt; please ignore errors.\n" msgstr "Nalaganje robots.txt; prosim, prezrite napake.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Napaka med razèlenjevanjem URL posredni¹kega stre¾nika %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Napaka v URL posredni¹kega stre¾nika %s: Mora biti HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d preusmeritev je bilo prekoraèenih.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3387,7 +3355,7 @@ msgstr "" "Opu¹èanje.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3395,127 +3363,127 @@ msgstr "" "Ponovni poskus.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Brez napake" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Nepodprta shema %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Shema manjka" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Neveljavno ime gostitelja" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Slaba ¹tevilka vrat" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Neveljavno uporabni¹ko ime" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Neprekinjen ¹tevilski naslov IPv6" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Naslovi IPv6 niso podprti" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Neveljaven ¹tevilski naslov IPv6" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Podpora HTTPS ni vgrajena" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Zaznana je bila nepopolna ali neveljavna veèbajtna sekvenca\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Ni bilo mogoèe dodeliti dovolj pomnilnika; pomnilnik izèrpan.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Ni bilo mogoèe dodeliti %ld bajtov; zmanjkalo je pomnilnika.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, fuzzy, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: medpomnilnik besedila je prevelik (%ld bajtov), prekinjanje.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Nadaljevanje v ozadju, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/utils.c:890 -#, fuzzy, c-format +#: src/utils.c:885 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "Ni bilo mogoèe izbrisati %s: %s\n" +msgstr "" -#: src/utils.c:897 +#: src/utils.c:892 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 -#, fuzzy, c-format +#: src/utils.c:937 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "%s: ni bilo mogoèe razre¹iti naslova gostitelja %s\n" +msgstr "" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "ni se bilo moè povezati z %s na vratih %d: %s.\n" +msgstr "Ni bilo mogoèe odstraniti simbolne povezave %s: %s\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "Napaka med zapisovanjem v %s: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3594,6 +3562,45 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: mo¾nost '--%s' ne dovoljuje argumenta\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neprepoznana mo¾nost '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: mo¾nost '-W %s' je dvoumna\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: mo¾nost '-W %s' ne dovoljuje argumenta\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: mo¾nost '-W %s' zahteva argument\n" + +#~ msgid "Authorization failed.\n" +#~ msgstr "Pooblastitev je spodletela.\n" + +#~ msgid "idn_decode failed (%d): %s\n" +#~ msgstr "Spodletel idn_decode (%d): %s\n" + +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "%s prejetih.\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Datoteka `%s' ¾e obstaja; prejemanje je preskoèeno.\n" + +#~ msgid "" +#~ "WARNING: Can't reopen standard output in binary mode;\n" +#~ " downloaded file may contain inappropriate line endings.\n" +#~ msgstr "" +#~ "OPOZORILO: Ni bilo mogoèe ponovno odpreti standardnega izhoda v binarnem " +#~ "naèinu;\n" +#~ " prejeta datoteka morda vsebuje neprimerne konce vrstic.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" @@ -3620,31 +3627,6 @@ msgstr "" #~ "Najdene so bile %d pokvarjene povezave.\n" #~ "\n" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: Neveljaven URL %s: %s\n" - -#~ msgid "idn_decode failed (%d): %s\n" -#~ msgstr "Spodletel idn_decode (%d): %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "%s prejetih.\n" - -#~ msgid "Authorization failed.\n" -#~ msgstr "Pooblastitev je spodletela.\n" - -#~ msgid "" -#~ "WARNING: Can't reopen standard output in binary mode;\n" -#~ " downloaded file may contain inappropriate line endings.\n" -#~ msgstr "" -#~ "OPOZORILO: Ni bilo mogoèe ponovno odpreti standardnega izhoda v binarnem " -#~ "naèinu;\n" -#~ " prejeta datoteka morda vsebuje neprimerne konce vrstic.\n" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: nedovoljena izbira -- %c\n" diff --git a/po/sr.gmo b/po/sr.gmo index c1e7280..d9c9c7b 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index 02bfcab..80ba4a7 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: wget-1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-27 08:00+0200\n" "Last-Translator: МироÑлав Ðиколић \n" "Language-Team: Serbian <(nothing)>\n" @@ -19,7 +19,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ðепозната грешка ÑиÑтема" @@ -27,7 +27,7 @@ msgstr "Ðепозната грешка ÑиÑтема" msgid "Address family for hostname not supported" msgstr "Породица адреÑа за назив домаћина није подржана" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Привремени неуÑпех одређивања имена" @@ -95,70 +95,45 @@ msgstr "Прекинуто Ñигналом" msgid "Parameter string not correctly encoded" msgstr "ÐиÑка параметра није иÑправно кодирана" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ðепозната грешка" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: опција „%s“ је нејаÑна; могућноÑти:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: опција „%s“ је нејаÑна\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: опција „--%s“ не дозвољава аргумент\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: опција „%s“ је нејаÑна; могућноÑти:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: непозната опција „%c%s“\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опција „--%s“ захтева аргумент\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: непозната опција „--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: непозната опција „%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неиÑправна опција -- „%c“\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: опција „-W %s“ је нејаÑна\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: опција „-W %s“ захтева аргумент\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -178,13 +153,13 @@ msgstr "%s: опција „-W %s“ захтева аргумент\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -256,28 +231,28 @@ msgstr "Регуларан израз је превелик" msgid "Unmatched ) or \\)" msgstr "Ðе одговара ) или \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Ðема претходног регуларног израза" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "не могу да направим Ñпојку" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s Ð¿Ð¾Ñ‚Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð¸Ñ˜Ðµ уÑпео" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "„_open_osfhandle“ није уÑпело" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "не могу да повратим фд %d: „dup2“ није уÑпело" @@ -296,51 +271,51 @@ msgstr "%s Ð¿Ð¾Ñ‚Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñ˜Ðµ добио кобни Ñигнал %d" msgid "memory exhausted" msgstr "меморија је потрошена" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: не могу да решим адреÑу везе „%s“; иÑкључујем везе.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Повезујем Ñе на %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Повезујем Ñе на %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Повезујем Ñе на [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "„setsockopt SO_RCVBUF“ није уÑпело: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "повезан Ñам.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "неуÑпех: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: не могу да разрешим адреÑу домаћина „%s“\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "„setsockopt SO_REUSEADDR“ није уÑпело: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -376,175 +351,175 @@ msgstr "Ðе могу да обришем „%s“: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ðе могу да направим резерву за „%s“ као %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Ðе могу да добавим колачиће за „%s“\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Садржајна грешка у подешавању колачића: %s на меÑту %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Колачић Ñа „%s“ је покушао да поÑтави домен на " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ðе могу да отворим датотеку колачића „%s“: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Грешка пиÑања у „%s“: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Грешка затварања „%s“: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" "Ð’Ñ€Ñта иÑпиÑа није подржана, покушавам Ñа обрађивачем ÑпиÑкова ЈуникÑа.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "СпиÑак за /%s на %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "непознато време " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Датотека " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Директоријум " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Веза " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Ðије Ñигурно " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s бајт(ов)(а))" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Дужина: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) је проÑтало" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s је проÑтало" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (није поуздано)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Ðе могу да покренем ССЛ. Биће иÑкључено." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Пријављујем Ñе као %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Грешка у одговору Ñа Ñервера, затварам контролну везу.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Грешка у поздравној поруци Ñа Ñервера.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Ð£Ð¿Ð¸Ñ Ð½Ð¸Ñ˜Ðµ уÑпео, затварам контролну везу.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Сервер не дозвољава пријаву.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Пријава није иÑправна.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Пријављен Ñам!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Сервер не прихвата наредбу „PBSZ 0“.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Сервер не прихвата наредбу „PROT %c“.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Грешка Ñервера, не може утврдити врÑту ÑиÑтема.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "обављено. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "готово.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Ðепозната врÑта „%c“, затварам контролну везу.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "обављено. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> ЦВД није потребан.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Стигох до логички немогућег одељка у „getftp()“" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -555,7 +530,7 @@ msgstr "" "прд_почетак: %d\n" "прд_крај: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -564,37 +539,37 @@ msgstr "" "Ðе поÑтоји директоријум „%s“.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> „CWD“ није потребан.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Датотека је већ преузета.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ðе могу да покренем ПÐСВ преноÑ.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Ðе могу да обрадим ПÐСВ одговор.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "не могу да Ñе повежем на „%s“ прикључак %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Грешка повезивања (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "ÐеиÑправан ПРИКЉУЧÐК.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -602,17 +577,17 @@ msgstr "" "\n" "„REST“ није уÑпео, почињем из почетка.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Датотека „%s“ поÑтоји.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Ðема такве датотеке „%s“.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -621,7 +596,7 @@ msgstr "" "Ðема такве датотеке „%s“.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -630,40 +605,40 @@ msgstr "" "Ðе поÑтоји таква датотека или директоријум „%s“.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "„%s“ је изникло у поÑтојање.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, затварам контролну везу.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) — Веза података: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Затворена је контролна веза.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "ÐŸÑ€ÐµÐ½Ð¾Ñ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ° је прекинут.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Датотека „%s“ већ поÑтоји; нећу је преузети.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(пробајте:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -672,7 +647,7 @@ msgstr "" "%s (%s) — запиÑано у Ñтандардни излаз %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -681,33 +656,33 @@ msgstr "" "%s (%s) — %s је Ñачувано [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Уклањам „%s“.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "КориÑтим „%s“ као привремену датотеку за ÑпиÑак.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Уклонио Ñам „%s“.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Дубина рекурзије %d је премашила највећу дубину од %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Удаљена датотека није новија од локалане „%s“ -- нећу преузети.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -716,7 +691,7 @@ msgstr "" "Удаљена датотека је новија од локалане „%s“ -- преузећу.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -725,11 +700,11 @@ msgstr "" "Величине Ñе не поклапају (локална %s) -- преузимам.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "ÐеиÑправан назив Ñимболичке везе, преÑкачем.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -738,238 +713,238 @@ msgstr "" "Већ имам иÑправну Ñимболичку везу %s —> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Правим Ñимболичку везу %s —> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Симболичке везе ниÑу подржане, преÑкачем Ñимболичку везу „%s“.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "ПреÑкачем директоријум „%s“.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: непозната/неподржана врÑта датотеке.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: оштећена временÑка ознака.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Ðећу преузети директоријуме пошто је дубина %d (највише %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе Ñпуштам Ñе у „%s“ пошто је иÑкључен/занемарен.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Одбијам „%s“.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Грешка упоређивања „%s“ Ñа „%s“: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðема подударања Ñа шаблоном „%s“.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "ЗапиÑах ХТМЛ-изован Ð¸Ð½Ð´ÐµÐºÑ Ñƒ „%s“ [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "ЗапиÑах ХТМЛ-изован Ð¸Ð½Ð´ÐµÐºÑ Ñƒ „%s“.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ГРЕШКÐ: Ðе могу да отворим директоријум „%s“.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ГРЕШКÐ: ÐиÑам уÑпео да отворим уверење „%s“: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Учитао Ñам ЦРуверење „%s“\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ГРЕШКÐ: ÐиÑам уÑпео да учитам ЦРЛ датотеку „%s“: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Учитао Ñам ЦРЛ датотеку „%s“\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "ГРЕШКÐ: ГнуТЛС захтева кључ и уверење да би био иÑте врÑте.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "ГнуТЛС: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "ИзвеÑтите о овом проблему на „bug-wget@gnu.org“\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "ГнуТЛС: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ГРЕШКÐ" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "УПОЗОРЕЊЕ" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s није приказао уверење.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Уверење од „%s“ није поуздано.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Уверење од „%s“ нема познатог издавача.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Уверење од „%s“ је опозвано.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: ПотпиÑник уверења за „%s“ није издавач уверења.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Уверење „%s“ је потпиÑано неÑигурним алгоритмом.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Уверење „%s“ још није покренуто.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Уверење „%s“ је иÑтекло.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Грешка покретања уверења X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "ÐиÑам пронашао уверење\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Грешка анализирања уверења: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Уверење још увек није активирано\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Уверење је иÑтекло\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "ВлаÑник уверења не одговара називу домаћина „%s“\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Јавни кључ не одговара прикаченом јавном кључу!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Уверење мора бити X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Грешка руковања ÑпиÑком адреÑа.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ðепознат домаћин" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Тражим „%s“... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "неуÑпех: Ðема ИПв4/ИПв6 адреÑа за домаћина.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "неуÑпех: време је иÑтекло.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Ðе могу да одредим непотпуну везу „%s“.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: ÐеиÑправна адреÑа „%s“: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "ÐиÑам уÑпео да запишем ХТТП захтев: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Ðема заглавља, подразумевам ХТТП/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -978,11 +953,11 @@ msgstr "" "Датотека „%s“ већ поÑтоји; нећу је преузети.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "„gmtime“ није уÑпео. Ово је вероватно грешка.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -990,55 +965,55 @@ msgstr "" "Ðе могу да претворим ознаку времена у хттп запиÑ. Пребацујем Ñе на време 0 " "као време поÑледње измене.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Датотека података „BODY“ „%s“ недоÑтаје: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Поново кориÑтим поÑтојећу везу Ñа [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Поново кориÑтим поÑтојећу везу Ñа %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "ÐиÑам уÑпео да прочитам одговор поÑредника: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ГРЕШКР%d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ÐеиÑправна трака Ñтања" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "ÐеуÑпело тунелиÑање поÑредника: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ðачин потврђивања идентитета није познат.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Изабрано је потврђивање идентитета: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Чувам у: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1047,22 +1022,22 @@ msgstr "" "Приликом преузимања потпиÑа:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðе могу да прочитам Ñадржај потпиÑа из привремене датотеке. ПреÑкачем.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" "Ðе могу да направим привремену датотеку. ПреÑкачем преузимање потпиÑа.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "ÐеиÑправна вредноÑÑ‚ при. Подразумевам „%d“.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1070,42 +1045,42 @@ msgstr "" "Ðе могу да нађем прихватљиви одабир за изворишта мета везе.\n" "Занемарујем их.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "ИÑкључујем ССЛ због грешака.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "„%s“ захтев је поÑлат, чекам одговор... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "ÐиÑу примљени никакви подаци.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Грешка читања (%s) у заглављима.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(нема опиÑа)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "МеÑто: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "није наведено" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [пратим]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1114,7 +1089,7 @@ msgstr "" "Датотека „%s“ није измењена на Ñерверу. ИзоÑтављам преузимање.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1125,7 +1100,7 @@ msgstr "" "Можда ћете желети да додате опцију „--no-if-modified-since“.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1135,58 +1110,58 @@ msgstr "" " Датотека је већ преузета у целини; неће бити поново преузета.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Дужина: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "занемарено" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Упозорење: џокер знаци Ñе не кориÑте за ХТТП.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Укључен је режим паука. Проверавам да ли поÑтоји удаљена датотека.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Ðе могу пиÑати у „%s“ (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Ðеопходан атрибут недоÑтаје у примљеном заглављу.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Ðије уÑпело потврђивање идентитета кориÑничког имена/лозинке.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ðе могу да пишем у Ð’ÐРЦ датотеку.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе могу да пишем у привремену Ð’ÐРЦ датотеку.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ðе могу да уÑпоÑтавим ССЛ везу.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Ðе могу да поништим везу „%s“ (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ГРЕШКÐ: ПреуÑмерење (%d) нема одредиште.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1194,26 +1169,26 @@ msgstr "" "Ðе могу да пронађем податке мета везе у ХТТП одговору. Преузимам датотеку " "кориÑтећи „HTTP GET“.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Ðађох заглавља мета везе. Пребацујем на режим мета везе.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Удаљена датотека не поÑтоји -- оштећена веза!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" "Заглавље датума поÑледње измене недоÑтаје -- бележење времена је иÑкључено.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" "Заглавље датума поÑледње измене је неиÑправно -- бележење времена је " "занемарено.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1222,16 +1197,16 @@ msgstr "" "Датотека на Ñерверу није новија од локалне датотеке „%s“ -- не преузимам.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Величине Ñе не поклапају (локална %s) -- преузимам.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Удаљена датотека је новија, преузимам.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1240,7 +1215,7 @@ msgstr "" "Удаљена датотека поÑтоји и можда Ñадржи везе до других извора -- преузимам.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1248,7 +1223,7 @@ msgstr "" "Удаљена датотека поÑтоји али не Ñадржи ниједну везу -- не преузимам.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1258,7 +1233,7 @@ msgstr "" "али дубачење је иÑкључено -- не преузимам.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1266,12 +1241,12 @@ msgstr "" "Удаљена датотека поÑтоји.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s адреÑа: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1280,7 +1255,7 @@ msgstr "" "%s (%s) — запиÑано у Ñтандардни излаз %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1289,58 +1264,58 @@ msgstr "" "%s (%s) — %s је Ñачувано [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) — Веза је затворена при бајту %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) — Грешка читања при бајту %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) — Грешка читања при бајту %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðеподржан квалитет заштите „%s“.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðеподржан алгоритам „%s“.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: ВГЕТРЦ указује на „%s“, које не поÑтоји.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðе могу да прочитам %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Грешка у „%s“ у реду %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Садржајна грешка у „%s“ у реду %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ðепозната наредба „%s“ у „%s“ у реду %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1352,7 +1327,7 @@ msgstr "" "„%s“,\n" "или наведите другачију датотеку кориÑтећи „--config“.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1363,47 +1338,47 @@ msgstr "" "„%s“,\n" "или наведите другачију датотеку кориÑтећи „--config“.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Упозорење: И ÑиÑтемÑки и кориÑников вгетрц указују на „%s“.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: ÐеиÑправна наредба „--execute“ „%s“\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: ÐеиÑправна Булова вредноÑÑ‚ „%s“, кориÑтите „on“ или „off“.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: ÐеиÑправно „%s“, кориÑтите „on“, „off“ или „quiet“.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: ÐеиÑправан број „%s“.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: „%s“ мора бити коришћено Ñамо једном\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: ÐеиÑправна вредноÑÑ‚ бајта „%s“\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: ÐеиÑправно временÑко раздобље „%s“\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1412,28 +1387,28 @@ msgstr "" "„use-askpass“ захтева да ниÑка или променљива окружења „WGET_ASKPASS“ или " "„SSH_ASKPASS“ буде подешена.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: ÐеиÑправна вредноÑÑ‚ „%s“.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: ÐеиÑправно заглавље „%s“.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: ÐеиÑправно Ð’ÐРЦ заглавље „%s“.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: ÐеиÑправна врÑта напредовања „%s“.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1442,40 +1417,40 @@ msgstr "" "%s: %s: ÐеиÑправно ограничење „%s“,\n" " кориÑтите [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "„%s“ кодирање није иÑправно\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Претварање из „%s“ у „%s“ није подржано\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ðепотпун или неиÑправан вишебајтни низ\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðемогућа грешка бр. %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "„locale_to_utf8“: локале је неподешено\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "„idn_encode“ није уÑпело (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "ÐиÑам уÑпео да претворим у ниже: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1484,17 +1459,17 @@ msgstr "" "\n" "ПреуÑмеравам излаз на „%s“.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; иÑкључујем дневник.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Употреба: %s [ОПЦИЈÐ]... [ÐДРЕСÐ]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1502,74 +1477,74 @@ msgstr "" "Обавезни аргументи за дуге опције Ñу обавезни и за кратке опције такође.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Покретање:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version приказује издање програма и излази\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help приказује ову помоћ\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background одлази у позадину након покретања\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=ÐÐРЕДБРизвршава наредбу „.wgetrc“-Ñтила\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Пријављивање и улазна датотека:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" " -o, --output-file=ДÐТОТЕКРзапиÑује поруке дневника у ДÐТОТЕКУ\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ДÐТОТЕКРкачи поруке у ДÐТОТЕКу\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d --debug иÑпиÑује доÑта података за уклањање " "грешака\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug иÑпиÑује „Watt-32“ излаз за уклањање " "грешака\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet нечујно (без излаза)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose опширан Ñа излазом (ово је оÑновно " "понашање)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose иÑкључује опширноÑÑ‚, а да није нечујан\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1577,7 +1552,7 @@ msgstr "" " --report-speed=ВРСТРиÑпиÑује пропуÑни опÑег као ВРСТУ. " "ВРСТРмогу бити битови\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1585,7 +1560,7 @@ msgstr "" " -i, --input-file=ДÐТОТЕКРпреузима адреÑе пронађене у меÑној или " "Ñпољној ДÐТОТЕЦИ\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1593,11 +1568,11 @@ msgstr "" " --input-metalink=ДÐТОТЕКРпреузима датотеке покривене у меÑној " "ДÐТОТЕЦИ мета везе\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html Ñматра улазну датотеку као ХТМЛ\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1606,29 +1581,29 @@ msgstr "" "F)\n" " које Ñе одноÑе на ÐДРЕСУ\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=ДÐТОТЕКРнаводи датотеку подешавања за " "коришћење\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config не чита ниједну датотеку подешавања\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ДÐТОТЕКРбележи разлоге одбијања адреÑе у " "ДÐТОТЕКУ\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Преузимање:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1636,18 +1611,18 @@ msgstr "" " -t, --tries=БРОЈ поÑтавља број покушаја на БРОЈ (0 за " "неограничено)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused покушаће поново чак и када је веза " "одбијена\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=ДÐТОТЕКРзапиÑује документе у ДÐТОТЕКУ\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1655,7 +1630,7 @@ msgstr "" " -nc, --no-clobber преÑкаче преузимања која би преузео у\n" " поÑтојеће датотеке (препиÑујући их)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1663,7 +1638,7 @@ msgid "" msgstr "" " --no-config не чита ниједну датотеку подешавања\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1671,7 +1646,7 @@ msgstr "" " -c, --continue наÑтавља Ñа добављањем делимично " "преузете датотеке\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1679,11 +1654,11 @@ msgstr "" " --start-pos=ПОМЕРÐЈ почиње преузимање од положаја ПОМЕРÐЈР" "нулте оÑнове\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=ВРСТРбира врÑту опÑега напредовања\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1691,7 +1666,7 @@ msgstr "" " --show-progress приказује траку напредовања у било ком " "режиму опширноÑти\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1701,7 +1676,7 @@ msgstr "" "ниÑу новије\n" " од меÑних\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1712,7 +1687,7 @@ msgstr "" " добавља захтеве у режиму временÑког " "означавања\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1721,21 +1696,21 @@ msgstr "" "датотеке\n" " оном на Ñерверу\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response иÑпиÑује одговор Ñервера\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider не преузима ништа\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДИ подешава Ñве вредноÑти временÑког " "иÑтека на СЕКУÐДЕ\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1743,7 +1718,7 @@ msgstr "" " --dns-servers=ÐДРЕСЕ ÑпиÑак ДÐС Ñервера за пропитивање " "(раздвојених зарезом)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1751,29 +1726,29 @@ msgstr "" " --bind-dns-address=ÐДРЕСРповезује ДÐС решавача Ñа ÐДРЕСОМ (назив " "домаћина или ИП) на локалном рачунару\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕКУÐДИ подешава временÑки иÑтек ДÐС понављања " "на СЕКУÐДЕ\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕКУÐДИ подешава временÑки иÑтек повезивања на " "СЕКУÐДЕ\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=СЕКУÐДИ подешава временÑки иÑтек читања на " "СЕКУÐДЕ\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=СЕКУÐДИ чека СЕКУÐДЕ између довлачења\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1781,7 +1756,7 @@ msgstr "" " --waitretry=СЕКУÐДЕ чека 1..СЕКУÐДЕ између покушаја " "довлачења\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1789,16 +1764,16 @@ msgstr "" " --random-wait чека од 0.5*ЧЕКÐЈ...1.5*ЧЕКÐЈ Ñекунде " "између довлачења\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy изричито иÑкључује поÑредника\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=БРОЈ поÑтавља квоту довлачења на БРОЈ\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1806,18 +1781,18 @@ msgstr "" " --bind-address=ÐДРЕСРповезује Ñе на ÐДРЕСУ (назив домаћина " "или ИП) на локалном рачунару\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=БРЗИÐРограничава проток преузимања на БРЗИÐУ\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache иÑкључује привремени Ñмештај ДÐС " "понављања\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1825,7 +1800,7 @@ msgstr "" " --restrict-file-names=ОС ограничава знаке у називима датотека на " "допуштене ОС-ом\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1833,15 +1808,15 @@ msgstr "" " --ignore-case занемарује величину Ñлова приликом " "упоређивања датотека/директоријума\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only повезује Ñе Ñамо на ИПв4 адреÑе\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only повезује Ñе Ñамо на ИПв6 адреÑе\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1851,24 +1826,24 @@ msgstr "" "породице,\n" " на ИПв6, ИПв4, или ништа\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=КОРИСÐИК поÑтавља и фтп и хттп кориÑника на " "КОРИСÐИКÐ\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ЛОЗИÐКРпоÑтавља и фтп и хттп лозинку на " "ЛОЗИÐКУ\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password пита за лозинке\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1886,29 +1861,29 @@ msgstr "" "окружења \n" " „WGET_ASKPASS“ или „SSH_ASKPASS“.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri иÑкључује ИРИ подршку\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КОДИРÐЊЕ кориÑти КОДИРÐЊЕ као локално кодирање " "за ИРИ-је\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КОДИРÐЊЕ кориÑти КОДИРÐЊЕ као оÑновно удаљено " "кодирање\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink уклања датотеку пре препиÑивања\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1916,7 +1891,7 @@ msgstr "" " --keep-badhash задржава датотеке Ñа неодговарајућом " "Ñумом провере (придодаје „.badhash“)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1924,7 +1899,7 @@ msgstr "" " --metalink-index=БРОЈ Метавеза програм/метавеза4+икÑмл метаурл " "редни број БРОЈ\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1932,14 +1907,14 @@ msgstr "" " --metalink-over-http кориÑти метаподатке мета везе из " "заглавља ХТТП одговора\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location жељено меÑто за изворишта мета везе\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1947,35 +1922,35 @@ msgstr "" " --no-xattr иÑкључује Ñмештање метаподатака у " "проширеним атрибутима датотеке\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Директоријуми:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтвара директоријуме\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" " -x, --force-directories приморава Ñтварање директоријума\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories не Ñтвара директоријуме домаћина\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories кориÑти назив протокола у " "директоријумима\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ПРЕФИКС чува датотеке у ПРЕФИКС/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -1983,26 +1958,26 @@ msgstr "" " --cut-dirs=БРОЈ занемарује БРОЈ делова удаљеног " "директоријума\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "ХТТП опције:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=КОРИСÐИК поÑтавља хттп кориÑника на КОРИСÐИКÐ\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=ЛОЗИÐКРпоÑтавља хттп лозинку на ЛОЗИÐКУ\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache онемогућава податке причуване Ñервером\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2010,7 +1985,7 @@ msgstr "" " --default-page=ÐÐЗИВ мења оÑновни назив Ñтранице (обично\n" " је то „index.html“.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2018,43 +1993,43 @@ msgstr "" " -E, --adjust-extension чува ХТМЛ/ЦСС документа Ñа ÑопÑтвеним " "проширењима\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length занемарује поље заглавља „Content-" "Length“ (величина-Ñадржаја)\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=ÐИСКРумеће ÐИСКУ у заглавља\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=ВРСТРбира врÑту опÑега напредовања\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect највише преуÑмеравања допуштених по " "Ñтраници\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=КОРИСÐИК поÑтавља КОРИСÐИКРза кориÑничко име " "поÑредника\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ЛОЗИÐКРпоÑтавља ЛОЗИÐКУ за лозинку поÑредника\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2062,11 +2037,11 @@ msgstr "" " --referer=ÐДРЕСРукључује заглавље „Referer: ÐДРЕСГ у " "ХТТП захтев\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers чува ХТТП заглавља у датотеку\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2074,7 +2049,7 @@ msgstr "" " -U, --user-agent=ÐГЕÐТ претÑтавља Ñе као ÐГЕÐТ умеÑто Вгет/" "ИЗДÐЊЕ\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2082,23 +2057,23 @@ msgstr "" " --no-http-keep-alive иÑкључује ХТТП одржи-живим (трајне " "везе)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не кориÑти колачиће\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=ДÐТОТЕКРучитава колачиће из ДÐТОТЕКЕ пре " "ÑеÑије\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=ДÐТОТЕКРчува колачиће у ДÐТОТЕКУ након ÑеÑије\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2106,7 +2081,7 @@ msgstr "" " --keep-session-cookies учитава и чува (не-поÑтојане) колачиће " "ÑеÑије\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2114,7 +2089,7 @@ msgstr "" " --post-data=ÐИСКРкориÑти ПОСТ начин; шаље ÐИСКУ као " "податке\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2122,13 +2097,13 @@ msgstr "" " --post-file=ДÐТОТЕКРкориÑти ПОСТ начин; шаље Ñадржај " "ДÐТОТЕКЕ\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=ХТТПÐачин кориÑти начин „ХТТПÐачин“ у захтеву\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2136,7 +2111,7 @@ msgstr "" " --body-data=ÐИСКРшаље ÐИСКУ као податке. „--method“ МОРР" "бити подешен\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2144,7 +2119,7 @@ msgstr "" " --body-file=ДÐТОТЕКРшаље Ñадржаје ДÐТОТЕКЕ. „--method“ МОРР" "бити подешен\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2155,7 +2130,7 @@ msgstr "" "када\n" " бира називе меÑних датотека (ПРОБÐО)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2163,7 +2138,7 @@ msgstr "" " --content-on-error иÑпиÑује примљени Ñадржај на грешкама " "Ñервера\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2175,11 +2150,11 @@ msgstr "" " а да прво не чека за изазовом\n" " Ñервера\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "ХТТПС (ССЛ/ТЛС) опције:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2190,39 +2165,39 @@ msgstr "" "ССЛв2,\n" " ССЛв3, ТЛСв1 и ПФС\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only прати Ñамо безбедне ХТТПС везе\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate не оверава уверење Ñервера\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=ДÐТОТЕКРдатотека уверења клијента\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=ВРСТРврÑта уверења клијента, ПЕМ или ДЕР\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ДÐТОТЕКРдатотека личног кључа\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ВРСТРврÑта личног кључа, ПЕМ или ДЕР\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" " --ca-certificate=ДÐТОТЕКРдатотека Ñа Ñвежњом издавача уверења\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2230,12 +2205,12 @@ msgstr "" " --ca-directory=ДИР директоријум у коме Ñе чува ÑпиÑак " "издавача уверења\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" " --crl-file=ДÐТОТЕКРдатотека Ñа Ñвежњом издавача уверења\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2251,7 +2226,7 @@ msgstr "" " „sha256//“ раздвојених „;“, за проверу\n" " парњака\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2259,7 +2234,7 @@ msgstr "" " --random-file=ДÐТОТЕКРдатотека Ñа наÑумичним подацима за " "Ñејање ССЛ ПРÐГ-а\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2267,15 +2242,15 @@ msgstr "" " --egd-file=ДÐТОТЕКРдатотека која именује ЕГД прикључницу " "наÑумичним подацима\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "ХСТС опције:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts иÑкључује ХСТС\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2283,11 +2258,11 @@ msgstr "" " --hsts-file путања ХСТС базе података (препиÑаће " "оÑновно)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "ФТП опције:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2295,37 +2270,37 @@ msgstr "" " --ftp-stmlf КориÑти „Stream_LF“ формат за Ñве " "бинарне ФТП датотеке\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=КОРИСÐИК поÑтавља фтп кориÑника на КОРИСÐИКÐ\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=ЛОЗИÐКРпоÑтавља фтп лозинку на ЛОЗИÐКУ\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не уклања „.listing“ датотеке\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob иÑкључије угрушавање назива ФТП " "датотека\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp иÑкључује „неактиван“ режим преноÑа\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions задржава овлашћења удаљене датотеке\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2333,11 +2308,11 @@ msgstr "" " --retr-symlinks приликом дубачења, добавља везане-на " "датотеке (не директоријуме)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "ФТПС опције:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2345,7 +2320,7 @@ msgstr "" " --ftps-implicit кориÑти изричито ФТПС (оÑновни " "прикључник је 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2355,7 +2330,7 @@ msgstr "" "управљачкој вези приликом\n" " отварања везе података\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2363,7 +2338,7 @@ msgstr "" " --ftps-clear-data-connection шифрује Ñамо канал управљања; Ñви " "подаци биће обичан текÑÑ‚\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2371,11 +2346,11 @@ msgstr "" " --ftps-fallback-to-ftp враћање на ФТП ако је ФТПС није " "подржано на циљном Ñерверу\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Ð’ÐРЦ опције:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2383,24 +2358,24 @@ msgstr "" " --warc-file=ÐÐЗИВ ДÐТОТЕКЕ чува податке захтева/одговора у „.warc." "gz“ датотеку\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=ÐИСКРумеће ÐИСКУ у варцинфо запиÑ\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=БРОЈ поÑтавља највећу величину Ð’ÐРЦ датотека " "на БРОЈ\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" " --warc-cdx запиÑује датотеке Ð¦Ð”Ð˜ÐºÑ Ñ€ÐµÐ³Ð¸Ñтра\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2408,16 +2383,16 @@ msgstr "" " --warc-dedup=ÐÐЗИВ ДÐТОТЕКЕ не Ñкладишти запиÑе наведене у овој " "Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÑ†Ð¸\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression не Ñажима Ð’ÐРЦ датотеке ГЗИП-ом\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests не прорачунава СХÐ1 збирке\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2425,7 +2400,7 @@ msgstr "" " --no-warc-keep-log не Ñкладишти датотеку дневника у Ð’ÐРЦ " "запиÑ\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2435,15 +2410,15 @@ msgstr "" "направи\n" " пиÑац Ð’ÐРЦ\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "ДубинÑко преузимање:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive наводи дубинÑко преузимање\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2451,7 +2426,7 @@ msgstr "" " -l, --level=БРОЈ највећа дубина дубачења („inf“ или 0 за " "неограничено)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2459,7 +2434,7 @@ msgstr "" " --delete-after брише датотеке локално након њиховог " "преузимања\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2469,7 +2444,7 @@ msgstr "" "које указују\n" " на меÑне датотеке\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2477,7 +2452,7 @@ msgstr "" " --convert-file-only претвара Ñамо део датотеке адреÑа (обично " "познато као назив оÑнове)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2485,7 +2460,7 @@ msgstr "" " --backups=N пре запиÑивања датотеке „X“, окреће Ñе " "на N датотека резерве\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2493,7 +2468,7 @@ msgstr "" " -K, --backup-converted пре претварања датотеке „X“, прави " "резерву „X_orig“\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2501,7 +2476,7 @@ msgstr "" " -K, --backup-converted пре претварања датотеке „X“, прави " "резерву „X.orig“\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2509,7 +2484,7 @@ msgstr "" " -m, --mirror Ñкраћеница за „-N -r -l inf --no-remove-" "listing“\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2517,7 +2492,7 @@ msgstr "" " -p, --page-requisites добавља Ñве Ñлике, итд. неопходне за " "приказ ХТМЛ Ñтранице\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2525,11 +2500,11 @@ msgstr "" " --strict-comments укључује изрично (СГМЛ) руковање ХТМЛ " "напоменама\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "ДубинÑко прихвати/одбиј:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2537,7 +2512,7 @@ msgstr "" " -A, --accept=СПИСÐК зарезом одвојени ÑпиÑак прихваћених " "проширења\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2545,49 +2520,49 @@ msgstr "" " -R, --reject=СПИСÐК зарезом одвојени ÑпиÑак одбијених " "проширења\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=РЕГИЗРÐЗ регуларан израз који одговара " "прихваћеним адреÑама\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=РЕГИЗРÐЗ регуларан израз који одговара одбијеним " "адреÑама\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ВРСТРврÑта регуларног израза (поÑикÑ|пцре)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" " --regex-type=ВРСТРврÑта регуларног израза (поÑикÑ)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=СПИСÐК зарезом одвојени ÑпиÑак прихваћених " "домена\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСÐК зарезом одвојени ÑпиÑак одбијених " "домена\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp прати ФТП везе из ХТМЛ докумената\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2595,7 +2570,7 @@ msgstr "" " --follow-tags=СПИСÐК зарезом одвојени ÑпиÑак праћених ХТМЛ " "ознака\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2603,21 +2578,21 @@ msgstr "" " --ignore-tags=СПИСÐК зарезом одвојени ÑпиÑак занемарених " "ХТМЛ ознака\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts иде на Ñтране домаћине приликом " "дубачења\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative прати релативне везе Ñамо\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=СПИСÐК ÑпиÑак допуштених директоријума\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2627,82 +2602,82 @@ msgstr "" "компонентом\n" " адреÑе преуÑмеравања\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=СПИСÐК ÑпиÑак иÑкључених директоријума\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не допире до родитељÑког директоријума\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "Предлоге и извештаје о грешкама шаљите на \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "ГÐУ Вгет %s, програм за не-узајамно преузимање датотека.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Лозинка за кориÑника „%s“: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Лозинка: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе могу да направим Ñпојку\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Грешка покретања радњи израђања датотеке за „use-askpass“: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Грешка подешавања радњи израђања датотеке за „use-askpass“: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Грешка читања одговора из наредбе „%s %s“: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "КориÑничко име за „%s%s“: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Лозинка за „%s%s@%s“: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Вгетрц: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Локалитет: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "СаÑтављен: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Веза: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2711,29 +2686,29 @@ msgstr "" "ГÐУ Вгет %s изграђен %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (окруж)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (кориÑник)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (ÑиÑтем)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "ÐуторÑка права © %s Задужбина Ñлободног Ñофтвера, Доо.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2747,7 +2722,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2755,36 +2730,36 @@ msgstr "" "\n" "Првобитни аутор је Хрвоје Ðикшић .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "Питања и извештаје о грешкама шаљите на .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Проблем раÑподеле меморије\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Излазим због грешке у „%s“\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Покушајте „%s --help“ за више могућноÑти.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: неиÑправна опција -- „-n%c“\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Подршка прочишћавања није преведена. Занемарујем опцију „--debug“.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2793,7 +2768,7 @@ msgstr "" "И „--no-clobber“ и „--convert-links“ Ñу наведени, Ñамо „--convert-links“ ће " "бити коришћено.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2802,24 +2777,24 @@ msgstr "" "И „--no-clobber“ и „--convert-file-only“ Ñу наведени, Ñамо „--convert-file-" "only“ ће бити коришћено.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Ðије могуће бити нечујан и опширан у иÑто време.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Ðије могуће променити временÑке ознаке без промене Ñтарих датотека у иÑто " "време.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðије могуће навеÑти и „--inet4-only“ и „--inet6-only“.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2831,7 +2806,7 @@ msgstr "" "Ñа „-p“ или „-r“. Погледајте упутÑтво за детаље.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2842,7 +2817,7 @@ msgstr "" "бити Ñмештен у једну датотеку коју Ñте навели.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2853,12 +2828,7 @@ msgstr "" "упутÑтво за појединоÑти.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Датотека „%s“ већ поÑтоји, не преузимам поново.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2866,19 +2836,19 @@ msgstr "" "Ð’ÐРЦ излаз не ради Ñа опцијом „--no-clobber“, „--no-clobber“ ће бити " "иÑкључено.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" "Ð’ÐРЦ излаз не ради Ñа временÑким означавањем, иÑто ће бити иÑкључено.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Ð’ÐРЦ излаз не ради Ñа опцијом „--spider“.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2887,7 +2857,7 @@ msgstr "" "Ð’ÐРЦ излаз не ради Ñа опцијом „--continue“, „--start-pos“ ће бити " "иÑкључено.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2895,7 +2865,7 @@ msgstr "" "Збирке Ñу иÑкључене; Ð’ÐРЦ-ове поништавање удвоÑтрученÑоти неће наћи " "удвоÑтручене запиÑе.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2904,12 +2874,12 @@ msgstr "" "Ð’ÐРЦ излаз не ради Ñа опцијом „--continue“, „--start-pos“ ће бити " "иÑкључено.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Ðије могуће навеÑти и „--ask-password“ и „--password“.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2918,17 +2888,17 @@ msgstr "" "Ðавођење и „--start-pos“ и „--continue“ Ñе не препоручује; „--continue“ биће " "иÑкључено.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: недоÑтаје адреÑа\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Ðе можете навеÑти и „--post-data“ и „--post-file“.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2937,7 +2907,7 @@ msgstr "" "Ðе можете да кориÑтите „--post-data“ или „--post-file“ уз „--method“. „--" "method“ очекује податке кроз „--body-data“ и „--body-file“\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2946,17 +2916,17 @@ msgstr "" "Морате да наведете начин кроз „--method=ХТТПÐачин“ да кориÑтите Ñа „--body-" "data“ или „--body-file“.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðе можете навеÑти и „--body-data“ и „--body-file“.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Ово издање нема подршку за ИРИ-је\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2964,7 +2934,7 @@ msgstr "" "„-k“ или „-r“ може бити коришћено Ñа „-O“ Ñамо ако даје резултат у регуларну " "датотеку.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2973,42 +2943,42 @@ msgstr "" "„--convert-links“ или „--convert-file-only“ Ñе могу кориÑтити заједно Ñамо " "ако резултат иде у регуларну датотеку.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "ÐиÑам уÑпео да покренем „libcares“\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "ÐиÑам уÑпео да покренем „c-ares“ канал\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "ÐиÑам уÑпео да обрадим ИП адреÑу „%s“\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "ÐиÑам уÑпео да поÑтавим ДÐС Ñервер(е) „%s“ (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "ÐиÑам пронашао адреÑе у „%s“.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе могу да обрадим датотеку мета везе „%s“.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðе могу да преузмем Ñва изворишта Ñа „%s“.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3019,7 +2989,7 @@ msgstr "" "Укупно време: %s\n" "Преузетих датотека: %d, %s за %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ПРЕМÐШЕРје лимит преузимања од %s!\n" @@ -3175,106 +3145,106 @@ msgstr "Датотека „%s“ је преузета али Ð¿Ð¾Ñ‚Ð¿Ð¸Ñ Ð½Ðµ msgid "Renaming %s to %s.\n" msgstr "Преименујем „%s“ у „%s“.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "ÐаÑтављам у позадини.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "ÐаÑтављам рад у позадини, пид %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Резултат ће бити запиÑан у „%s“.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "није уÑпело „fake_fork_child()“\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "није уÑпело „fake_fork()“\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Ðе могу да пронађем пригодан уређај за утичницу.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" "није уÑпело „ioctl()“. Прикључница не може бити подешена као блокирајућа.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: упозорење: текÑÑ‚ „%s“ Ñе појављује пре било ког назива машине\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: непознат Ñимбол „%s“\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Употреба: %s NETRC [РÐЧУÐÐР]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: не могу да добавим податке за %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "УПОЗОРЕЊЕ: кориÑтим Ñлабо наÑумично Ñеме.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Ðе могу да Ñејем ПРÐГ; размотрите употребу „--random-file“.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Ваше издање ОпенССЛ-а је превише Ñтаро да подржи ТЛСи1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "ОпенССЛ: непримењена вредноÑÑ‚ %d опције „secure-protocol“\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: не могу да проверим %s уверење, које је издао „%s“:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðе могу у локалу да проверим надлештво издавача.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Пронађох ÑамопотпиÑано уверење.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Издато уверење још није важеће.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Издато уверење је иÑтекло.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3283,7 +3253,7 @@ msgstr "" "%s: ниједан други назив предмета уверења не одговара\n" " затраженом називу домаћина „%s“.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3291,7 +3261,7 @@ msgstr "" " %s: општи назив уверења „%s“ не одговара затраженом називу домаћина " "„%s“.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3302,13 +3272,13 @@ msgstr "" " Ово може бити указ да домаћин није онај за кога Ñе претÑтавља\n" " (тако је, није Ñтварни „%s“).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Да Ñе неÑигурно повежете на „%s“, употребите „--no-check-certificate“.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3317,28 +3287,28 @@ msgstr "" "\n" "%*s[ преÑкачем %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "ÐеиÑправна наводница Ñтила тачке „%s“; оÑтављам непромењено.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " ета %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " у " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ðе могу да добавим учетаноÑÑ‚ такта СТВÐРÐОГВРЕМЕÐÐ: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Уклањам „%s“ јер ће бити одбачен.\n" @@ -3352,22 +3322,22 @@ msgstr "Ðе могу да отворим „%s“: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Учитавам „robots.txt“; молим занемарите грешке.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Грешка обраде адреÑе поÑредника „%s“: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Грешка у адреÑи поÑредника „%s“: мора бити ХТТП.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d премашених преуÑмеравања.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3375,7 +3345,7 @@ msgstr "" "ОдуÑтајем.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3383,127 +3353,127 @@ msgstr "" "Пробам поново.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Ðема грешке" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Ðеподржана шема „%s“" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "ÐедоÑтаје шема" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "ÐеиÑправан назив домаћина" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "ÐеиÑправан број порта" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "ÐеиÑправно кориÑничко име" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Ðеокончана ИПв6 бројевна адреÑа" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "ИПв6 адреÑе ниÑу подржане" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "ÐеиÑправна ИПв6 бројевна адреÑа" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "ХТТПС подршка није уграђена" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ðепотпун или неиÑправан вишебајтни низ\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: ÐиÑам уÑпео да доделим довољно меморије; меморија је потрошена.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: ÐиÑам уÑпео да доделим %ld бајта; меморија је потрошена.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: текÑтуална међумеморија је превелика (%d бајта), прекидам.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "ÐаÑтављам рад у позадини, пид %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "ÐиÑам уÑпео да развежем Ñимболичку везу „%s“: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "ÐиÑам уÑпео да покренем „libcares“\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "ÐиÑам уÑпео да обрадим ИП адреÑу „%s“\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "ÐиÑам уÑпео да подеÑим овлашћења за „%s“.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ðеправилан регуларан израз: %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Грешка приликом упаривања %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3590,6 +3560,24 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Ðађох тачно поклапање у Ð¦Ð”Ð˜ÐºÑ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÑ†Ð¸. Чувам Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ðµ поÑете у Ð’ÐРЦ.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: опција „--%s“ не дозвољава аргумент\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: непозната опција „--%s“\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: опција „-W %s“ је нејаÑна\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: опција „-W %s“ захтева аргумент\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Датотека „%s“ већ поÑтоји, не преузимам поново.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/sv.gmo b/po/sv.gmo index be7955a..064205e 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 9042467..eac59dc 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-02-06 11:24+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -21,7 +21,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -29,7 +29,7 @@ msgstr "Okänt systemfel" msgid "Address family for hostname not supported" msgstr "Adressfamiljen för värdnamnet stödjs inte" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Temporärt fel i namnuppslagning" @@ -97,70 +97,45 @@ msgstr "Avbruten av en signal" msgid "Parameter string not correctly encoded" msgstr "Parametersträng inte korrekt kodad" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Okänt fel" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: flaggan â€%s†är tvetydig; möjligheter:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" är tvetydig\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: flaggan \"--%s\" tar inget argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: flaggan â€%s†är tvetydig; möjligheter:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: okänd flagga \"%c%s\"\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaggan \"--%s\" behöver ett argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: okänd flagga \"--%s\"\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: okänd flagga \"%c%s\"\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- \"%c\"\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan behöver ett argument -- \"%c\"\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: flaggan \"-W %s\" är tvetydig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: flaggan \"-W %s\" tar inget argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -180,13 +155,13 @@ msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "\"" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "\"" @@ -258,28 +233,28 @@ msgstr "Reguljärt uttryck är för stort" msgid "Unmatched ) or \\)" msgstr "Ensam ) eller \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Inget tidigare reguljärt uttryck" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "kan inte skapa ett rör" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s-underprocess misslyckades" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle misslyckades" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "kan inte Ã¥terställa fb %d: dup2 misslyckades" @@ -299,51 +274,51 @@ msgid "memory exhausted" msgstr "slut pÃ¥ minne" # bind? binda? FIXME. -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: kunde inte slÃ¥ upp bindningsadressen %s; inaktiverar bindning.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Ansluter till %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Ansluter till %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Ansluter till [%s]:%d … " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF misslyckades: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "ansluten.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "misslyckades: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: kunde inte slÃ¥ upp värdadressen %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR misslyckades: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "För mÃ¥nga fb öppna. Kan inte använda select pÃ¥ en fb ≥ %d\n" @@ -377,174 +352,174 @@ msgstr "Kunde inte ta bort %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Kan inte säkerhetskopiera %s som %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Kan inte hämta kaka för %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Syntaxfel i \"Set-Cookie\": %s vid position %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Kaka som kommer frÃ¥n %s försökte ställa in domän till " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Kan inte öppna kakfilen %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Fel vid skrivning till %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Fel vid stängning av %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Listningstypen stöds inte, försöker med Unix-listtolkare.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "InnehÃ¥ll i /%s pÃ¥ %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "okänd tid " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Fil " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Katalog " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Länk " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Osäker " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte) " -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Längd: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) Ã¥terstÃ¥r" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s Ã¥terstÃ¥r" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (inte auktoritativt)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Kunde inte initiera SSL. Det kommer avaktiveras." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Loggar in som %s... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Fel i serversvar, stänger styranslutning.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Fel i serverhälsning.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Skrivning misslyckades, stänger styranslutning.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Inloggning nekas av servern.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Felaktig inloggning.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Inloggad!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Servern accepterade inte kommandot â€PBSZ 0â€.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Servern accepterade inte kommandot â€PROT %câ€.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Serverfel, kan inte avgöra systemtyp.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "färdig. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "färdig.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Typen \"%c\" är okänd, stänger styranslutning.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "färdig. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD behövs inte.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Logiskt omöjlig sektion nÃ¥dd i getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -555,7 +530,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -564,37 +539,37 @@ msgstr "" "Katalogen %s finns inte.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD behövs inte.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Filen har redan hämtats.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Kan inte initiera PASV-överföring.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Kan inte tolka PASV-svar.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "kunde inte ansluta till %s port %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bindningsfel (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Felaktig PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -602,17 +577,17 @@ msgstr "" "\n" "REST misslyckades, startar om frÃ¥n början.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Filen %s finns redan.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Filen %s finns inte.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -621,7 +596,7 @@ msgstr "" "Filen %s finns inte.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -630,40 +605,40 @@ msgstr "" "Filen eller katalogen %s finns inte.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s har uppstÃ¥tt.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, stänger styranslutning.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Dataanslutning: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Styranslutning stängd.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Dataöverföring avbruten.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Filen %s finns redan där; hämtar den inte.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(försök:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -672,7 +647,7 @@ msgstr "" "%s (%s) - skrevs till standard ut %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -681,33 +656,33 @@ msgstr "" "%s (%s) - %s sparades [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Tar bort %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Använder %s som temporär listningsfil.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Tog bort %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Rekursionsdjupet %d överskred det maximala djupet %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Fjärrfilen är inte nyare än lokala filen %s -- hämtar den inte.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -716,7 +691,7 @@ msgstr "" "Fjärrfilen är nyare än lokala filen %s -- hämtar den.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -725,11 +700,11 @@ msgstr "" "Storlekarna stämmer inte överens (lokal %s) -- hämtar.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ogiltig symbolisk länk, hoppar över.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -738,238 +713,238 @@ msgstr "" "En korrekt symbolisk länk %s -> %s finns redan.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Skapar symbolisk länk %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Symboliska länkar stöds inte, hoppar över symboliska länken %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Hoppar över katalogen %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: okänd filtyp/filtypen stöds inte.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: felaktig tidsstämpel.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Hämtar inte kataloger eftersom djupet är %d (max %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "GÃ¥r inte ner till %s eftersom det är undantaget/inte-inkluderat.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Nekar %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Fel vid matchning av %s mot %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Inga träffar med mönstret %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Skrev HTML-iserat index till %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Skrev HTML-iserat index till %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "FEL: Kan inte öppna katalogen %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "FEL: Kan inte öppna certifikatet %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Läste in CA-certifikatet â€%sâ€\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "FEL: Misslyckades att läsa in CRL-filen â€%sâ€: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Läste in CRL-filen â€%sâ€\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "FEL: GnuTLS förutsätter att nyckeln och certifikatet har samma typ.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: oimplementerat värde %d pÃ¥ alternativet â€secure-protocolâ€\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Rapportera gärna detta problem till bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: oimplementerat värde %d pÃ¥ alternativet â€secure-protocolâ€\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "FEL" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "VARNING" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Inget certifikat presenterades av %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Certifikatet för %s är inte betrott.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Certifikatet för %s saknar en känd utfärdare.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Certifikatet för %s har spärrats.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: Certifikatsigneraren av %s är inte en CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Certifikatet för %s signerades med en osäker algoritm.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Certifikatet för %s är inte aktiverat ännu.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Certifikatet för %s har gÃ¥tt ut.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Fel vid initiering av X509-certifikat: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Inget certifikat hittades\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Fel vid tolkning av certifikat: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Certifikatet har ännu inte aktiverats\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Certifikatet har gÃ¥tt ut\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Certifikatets ägare matchar inte värdnamnet %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Den publika nyckeln stämmer inte med fäst publik nyckel!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Certifikatet mÃ¥ste vara X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Fel i hantering av adresslistan.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Okänd värd" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "SlÃ¥r upp %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "misslyckades: Inga IPv4/IPv6-adresser för värd.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "misslyckades: tidsgräns uppnÃ¥ddes.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Kan inte slÃ¥ upp den ofullständiga länken %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ogiltig URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Misslyckades med att skriva HTTP-begäran: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Inga rubriker, antar HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -978,11 +953,11 @@ msgstr "" "Filen %s finns redan där; hämtar den inte.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime misslyckades. Detta är förmodligen ett programfel.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -990,55 +965,55 @@ msgstr "" "Kan inte konvertera tidsstämpel till http-format. Faller tillbaka till tid " "0 som senaste modifieringstid.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Datafil för BODY %s saknas: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Ã…teranvänder befintlig anslutning till [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Ã…teranvänder befintlig anslutning till %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Misslyckades med att läsa proxysvar: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s FEL %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Felaktig statusrad" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Proxytunnel misslyckades: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Okänd autentiseringsmetod.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Vald autentisering: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Sparar till: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1047,20 +1022,20 @@ msgstr "" "När signaturen hämtades:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Kan inte läsa signaturinnehÃ¥llet frÃ¥n temporärfilen. Hoppar över.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Kunde inte skapa temporärfilen. Hoppar över att hämta signaturen.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Felaktigt pri-värde. Antar %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1068,42 +1043,42 @@ msgstr "" "Kunde inte hitta en acceptabel kontrollsumma för Metalink-resurser.\n" "Hoppar över dem.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Inaktiverar SSL pÃ¥ grund av pÃ¥träffade fel.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-begäran skickad, väntar pÃ¥ svar... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ingen data mottagen.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Läsfel (%s) i rubriker.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(ingen beskrivning)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Adress: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "ospecificerat" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [följer]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1112,7 +1087,7 @@ msgstr "" "Filen %s är inte modifierad pÃ¥ servern. LÃ¥ter bli att hämta.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1123,7 +1098,7 @@ msgstr "" "Du kanske vill lägga till flaggan --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1133,81 +1108,81 @@ msgstr "" " Filen är redan fullständigt hämtad, inget att göra.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Längd: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ignorerad" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Varning: jokertecken stöds inte i HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Spindelläget aktiverat. Kontrollera om fjärrfilen finns.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Kan inte skriva till %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Det begärda attributet saknas i det mottagna huvudet.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Användarnamn-/lösenordsautentisering misslyckades.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Kan inte skriva till WARC-filen.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Kan inte skriva till en temporär WARC-fil.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Kan inte etablera en SSL-anslutning.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Kan inte ta bort %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "FEL: Omdirigering (%d) utan adress.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Hittade inte Metalink-data i HTTP-svaret. Hämtar filen med HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink-huvuden hittade. Byter till Metalink-läge.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Fjärrfilen finns inte -- trasig länk!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "\"Last-modified\"-rubrik saknas -- tidsstämplar avstängda.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "\"Last-modified\"-rubriken är ogiltig -- tidsstämpel ignorerad.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1216,16 +1191,16 @@ msgstr "" "Filen pÃ¥ servern är inte nyare än lokala filen %s -- hämtar den inte.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Storlekarna stämmer inte överens (lokal %s) -- hämtar.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Fjärrfilen är nyare, hämtar den.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1235,7 +1210,7 @@ msgstr "" "den.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1243,7 +1218,7 @@ msgstr "" "Fjärrfilen finns men innehÃ¥ller ingen länk -- hämtar den inte.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1253,7 +1228,7 @@ msgstr "" "men rekursion är inaktiverat -- hämtar den inte.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1261,12 +1236,12 @@ msgstr "" "Fjärrfilen finns.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1275,7 +1250,7 @@ msgstr "" "%s (%s) - skrevs till standard ut %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1284,58 +1259,58 @@ msgstr "" "%s (%s) - %s sparades [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Anslutningen stängd vid byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Läsfel vid byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Läsfel vid byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ej stödd skyddskvalitet â€%sâ€.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Algoritmen â€%s†stödjs inte.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC pekar till %s som inte finns.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Kan inte läsa %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Fel i %s vid rad %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Syntaxfel i %s pÃ¥ rad %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Okänt kommando %s i %s pÃ¥ rad %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1347,7 +1322,7 @@ msgstr "" "â€%sâ€,\n" "eller ange en annan fil med --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1358,47 +1333,47 @@ msgstr "" "â€%sâ€,\n" "eller ange en annan fil med --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Varning: BÃ¥de systemets och användarens wgetrc pekar till %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Kommando med argumentet --execute är ogiltigt %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ogiltigt booleskt värde %s; använd \"on\" eller \"off\".\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Ogiltigt %s; använd â€onâ€, â€off†eller â€quietâ€.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ogiltigt tal %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s fÃ¥r bara användas en gÃ¥ng\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ogiltigt bytevärde %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ogiltig tidsperiod %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1407,28 +1382,28 @@ msgstr "" "use-askpass behöver en sträng eller att antingen miljövariabeln WGET_ASKPASS " "eller SSH_ASKPASS är satt.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ogiltigt värde %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ogiltig rubrik %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Ogiltigt WARC-huvud %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Förloppstypen %s är ogiltig.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1437,40 +1412,40 @@ msgstr "" "%s: %s: Ogiltig begränsning %s,\n" " använd [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Kodningen %s är inte giltig\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Konvertering frÃ¥n %s till %s stöds inte\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Ofullständig eller ogiltig multibyte-sekvens pÃ¥träffades\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Ohanterat felnummer %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: lokalen är inte inställd\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode misslyckades (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Misslyckades att konvertera till gemen: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1479,17 +1454,17 @@ msgstr "" "\n" "Omdirigerar utdata till %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; deaktiverar loggning.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Användning: %s [FLAGGA]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1498,68 +1473,68 @@ msgstr "" "korta.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Uppstart:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version visa Wgets version och avsluta\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help skriv ut denna hjälp.\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background gÃ¥ till bakgrunden efter uppstart\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=KOMMANDO kör ett kommando i â€.wgetrcâ€-stil\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Loggning och inmatningsfil:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=FIL logga meddelanden till FIL\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=FIL lägg till meddelanden till FIL\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug skriv ut massor av " "felsökningsinformation\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug skriv ut Watt-32-felsökningsinformation\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet tyst (ingen utdata)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose var informativ (detta är standard)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose stäng av information, utan att vara tyst\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1567,7 +1542,7 @@ msgstr "" " --report-speed=TYP skriv ut bandvidd som TYP. TYP kan vara " "bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1576,7 +1551,7 @@ msgstr "" "extern\n" " FIL\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1584,11 +1559,11 @@ msgstr "" " --input-metalink=FIL hämta URL:ar som täcks av lokal Metalink-" "FIL\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html behandla inmatningsfil som HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1596,27 +1571,27 @@ msgstr "" " -B, --base=URL slÃ¥r upp HTML-länkar frÃ¥n indatafil\n" " (-i -F) relativa till URL\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=FIL ange konfigurationsfil att använda\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-config läs ingen konfigurationsfil\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=FIL logga anledningar till URL-avvisanden " "till FIL\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Hämta:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1624,17 +1599,17 @@ msgstr "" " -t, --tries=ANTAL sätt antal försök till ANTAL (0 " "obegränsar)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused försök igen även om anslutningen nekas\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=FIL skriv dokument till FIL\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1644,21 +1619,21 @@ msgstr "" " redan befintliga filer (skriva över " "dem)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-config läs ingen konfigurationsfil\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue Ã¥teruppta hämtning av delvis hämtad fil\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1666,11 +1641,11 @@ msgstr "" " --start-pos=AVSTÃ…ND börja hämta frÃ¥n nollbaserad position " "AVSTÃ…ND\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TYP välj typ av förloppsindikator\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1678,7 +1653,7 @@ msgstr "" " --show-progress visa förloppsmätare i alla " "informationslägen\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1688,7 +1663,7 @@ msgstr "" "än\n" " lokala\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1698,7 +1673,7 @@ msgstr "" "get-\n" " begäranden i tidsstämpelläge\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1706,19 +1681,19 @@ msgstr "" " --no-use-server-timestamps sätt inte den lokala filens tidsstämpel\n" " efter den pÃ¥ servern\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response skriv ut serversvar\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider hämta ingenting\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SEKUNDER sätt tidsgränser till SEKUNDER\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1726,7 +1701,7 @@ msgstr "" " --dns-servers=ADRESSER lista över DNS-servrar att frÃ¥ga\n" " (kommaseparerade)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1735,34 +1710,34 @@ msgstr "" "den\n" " lokala värden\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SEK sätt tidsgränsen för DNS-uppslagningar " "till\n" " SEK\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SEK sätt anslutningstidsgränsen till SEK\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SEK sätt lästidsgränsen till SEK\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SEKUNDER vänta SEKUNDER mellan hämtningar\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" " --waitretry=SEKUNDER vänta 1..SEKUNDER mellan hämtningsförsök\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1771,16 +1746,16 @@ msgstr "" "sekunder\n" " mellan hämtningar\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy stäng uttryckligen av proxy\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ANTAL ställ in mottagningskvot till ANTAL\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1788,17 +1763,17 @@ msgstr "" " --bind-address=ADRESS bind till ADRESS (värdnamn eller IP) pÃ¥\n" " lokal värd\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=FART begränsa hämtningshastighet till FART\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache inaktivera mellanlagring av DNS-uppslag\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1806,7 +1781,7 @@ msgstr "" " --restrict-file-names=OS begränsa tecken i filnamn till vad OS\n" " tillÃ¥ter\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1814,15 +1789,15 @@ msgstr "" " --ignore-case ignorera skiftläge när filer/kataloger\n" " matchas\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only anslut endast till IPv4-adresser\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only anslut endast till IPv6-adresser\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1832,14 +1807,14 @@ msgstr "" "familj,\n" " en av IPv6, IPv4 eller none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ANVÄNDARE ställ in bÃ¥de ftp- och http-användare " "till\n" " ANVÄNDARE\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" @@ -1847,11 +1822,11 @@ msgstr "" "till\n" " LÖSEN\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password frÃ¥ga efter lösenord\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1866,27 +1841,27 @@ msgstr "" " KOMMANDO anges används miljövariabeln\n" " WGET_ASKPASS eller SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri stäng av IRI-stöd\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=KOD använd KOD som lokal kodning för IRI:er\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=KOD använd KOD som standard fjärrkodning\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink ta bort filer före de skrivs över\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1894,7 +1869,7 @@ msgstr "" " --keep-badhash behÃ¥ll filer med kontrollsummefel (lägg " "till .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1902,7 +1877,7 @@ msgstr "" " --metalink-index=TAL Metalink application/metalink4+xml " "metaurl ordningsTAL\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1910,14 +1885,14 @@ msgstr "" " --metalink-over-http använd Metalink-metadata frÃ¥n HTTP-\n" " svarshuvuden\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location önskad plats för Metalink-resurser\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1925,56 +1900,56 @@ msgstr "" " --no-xattr slÃ¥ av lagring av metadata i utökade " "filattribut\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Kataloger:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories skapa inte kataloger\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories tvinga skapandet av kataloger\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories skapa inte värdkataloger\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories använd protokollnamn i kataloger\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX spara filer till PREFIX/…\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=ANTAL ignorera ANTAL fjärrkatalogkomponenter\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP-flaggor:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=ANVÄNDARE ställ in http-användare till ANVÄNDARE\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=LÖSEN ställ in http-lösenord till LÖSEN\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache tillÃ¥t inte mellanlagrad data pÃ¥ servern\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1983,7 +1958,7 @@ msgstr "" "(vanligtvis\n" " är detta â€index.htmlâ€.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -1991,41 +1966,41 @@ msgstr "" " -E, --adjust-extension spara HTML/CSS-dokument med korrekta " "ändelser\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ignorera â€Content-Lengthâ€-rubrikfält\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=STRÄNG infoga STRÄNG i huvudet\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TYP välj typ av förloppsindikator\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect maximalt tillÃ¥tna omdirigeringar per " "sida\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ANVÄNDARE ställ in ANVÄNDARE som proxy-" "användarnamn\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=LÖSEN ställ in LÖSEN som proxy-lösenord\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2033,11 +2008,11 @@ msgstr "" " --referer=URL inkludera â€Referer: URLâ€-rubrik i\n" " HTTP-begäran.\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers spara HTTP-rubrikerna till fil\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2045,7 +2020,7 @@ msgstr "" " -U, --user-agent=AGENT identifiera som AGENT istället för\n" " Wget/VERSION\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2053,22 +2028,22 @@ msgstr "" " --no-http-keep-alive inaktivera HTTP keep-alive (varaktiga\n" " anslutningar)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies använd inte kakor\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=FIL läs in kakor frÃ¥n FIL före sessionen\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=FIL spara kakor till FIL efter sessionen\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2076,7 +2051,7 @@ msgstr "" " --keep-session-cookies läs in och spara sessionskakor\n" " (icke-permanenta)\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2084,7 +2059,7 @@ msgstr "" " --post-data=STRÄNG använd POST-metoden; skicka STRÄNG som " "data\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2092,13 +2067,13 @@ msgstr "" " --post-file=FIL använd POST-metoden; skicka innehÃ¥llet i " "FIL\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetod använd metoden â€HTTPMetod†i begäran\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2106,14 +2081,14 @@ msgstr "" " --body-data=STRÄNG skicka STRÄNG som data. --method MÃ…STE " "anges\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" " --body-file=FIL innehÃ¥llet i FIL. --method MÃ…STE anges\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2125,7 +2100,7 @@ msgstr "" " när lokala filnamn väljs " "(EXPERIMENTELL)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2133,7 +2108,7 @@ msgstr "" " --content-on-error skriv ut det mottagna innehÃ¥llet vid " "serverfel\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2145,11 +2120,11 @@ msgstr "" " utan att först vänta pÃ¥ serverns\n" " kontrollfrÃ¥ga\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS-flaggor (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2160,50 +2135,50 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 och PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only följ endast säkra HTTPS-länkar\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate validera inte serverns certifikat\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=FIL klientcertifikatfil\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYP klientcertifikattyp, PEM eller DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=FIL fil med privat nyckel\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=TYP typ av privat nyckel, PEM eller DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=FIL fil med paketerade CA:er\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=KAT katalog där hash-lista av CA:er lagras\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=FIL fil med paketerade CRL:er\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2220,14 +2195,14 @@ msgstr "" "motparten\n" " mot.\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" " --random-file=FIL fil med slumpfrö för att sÃ¥ SSL PRNG\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2235,15 +2210,15 @@ msgstr "" " --egd-file=FIL fil med namnet för EGD-uttag med " "slumpdata\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS-flaggor:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts avaktivera HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2251,11 +2226,11 @@ msgstr "" " --hsts-file sökväg till HSTS-databas (kommer " "Ã¥sidosätta standard)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP-flaggor:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2264,34 +2239,34 @@ msgstr "" "binära\n" " FTP-filer\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=ANVÄNDARE ställ in ftp-användare till ANVÄNDARE\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=LÖSEN ställ in ftp-lösenord till LÖSEN\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ta inte bort â€.listingâ€-filer\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob stäng av FTP-filnamnsmatchning\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp avaktivera â€passivt†överföringsläge\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions behÃ¥ll fjärrfilens rättigheter\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2300,11 +2275,11 @@ msgstr "" "(inte\n" " kat)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS-flaggor:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2313,7 +2288,7 @@ msgstr "" "är\n" " 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2324,7 +2299,7 @@ msgstr "" " i styrförbindelsen när en\n" " dataförbindelse öppnas\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2332,7 +2307,7 @@ msgstr "" " --ftps-clear-data-connection chiffrera bara styrkanalen; all data\n" " kommer skickas som klartext\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2340,11 +2315,11 @@ msgstr "" " --ftps-fallback-to-ftp fall tillbaka till FTP om FTPS inte\n" " stödjs av mÃ¥lservern\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC-flaggor:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2352,23 +2327,23 @@ msgstr "" " --warc-file=FILNAMN spara begäran-/svardata i en .warc.gz-" "fil\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=STRÄNG infoga STRÄNG i warcinfo-posten\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ANTAL sätt maximal storlek pÃ¥ WARC-filer till " "ANTAL\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx skriv CDX-indexfiler\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2376,24 +2351,24 @@ msgstr "" " --warc-dedup=FILNAMN spara inte poster listade i denna CDX-" "fil\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression komprimera inte WARC-filer med GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests beräkna inte SHA1-kontrollsummor\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" " --no-warc-keep-log lagra inte loggfilen i en WARC-post\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2402,15 +2377,15 @@ msgstr "" " --warc-tempdir=KATALOG plats för temporärfiler som skapas av\n" " WARC-skrivaren\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Rekursiv hämtning:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive ange rekursiv hämtning\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2418,7 +2393,7 @@ msgstr "" " -l, --level=ANTAL maximalt rekursionsdjup (inf eller 0 för\n" " oändligt)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2426,7 +2401,7 @@ msgstr "" " --delete-after ta bort lokala filer efter att de " "hämtats\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2436,7 +2411,7 @@ msgstr "" "CSS\n" " pekar pÃ¥ lokala filer\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2444,7 +2419,7 @@ msgstr "" " --convert-file-only konvertera endast fildelen av URL:en\n" " (vanligen känt som basename)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2452,7 +2427,7 @@ msgstr "" " --backups=N före fil X skrivs, rotera upp till N " "säkerhetskopiefiler\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2461,7 +2436,7 @@ msgstr "" "säkerhetskopiera\n" " den som X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2470,7 +2445,7 @@ msgstr "" "säkerhetskopiera\n" " den som X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2478,7 +2453,7 @@ msgstr "" " -m, --mirror genväg för -N -r -l inf --no-remove-" "listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2487,7 +2462,7 @@ msgstr "" "att\n" " visa HTML-sidor\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2495,11 +2470,11 @@ msgstr "" " --strict-comments slÃ¥ pÃ¥ strikt (SGML) hantering av\n" " HTML-kommentarer\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Rekursiv acceptans/vägran:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2507,54 +2482,54 @@ msgstr "" " -A, --accept=LISTA kommaseparerad lista av accepterade " "ändelser\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" " -R, --reject=LISTA kommaseparerad lista av vägrade ändelser\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=REGUTTR reguljäruttryck som matchar godkända URL:" "ar\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=REGUTTR reguljäruttryck som matchar avvisade URL:" "ar\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=TYP typ av reguljäruttryck (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TYP typ av reguljäruttryck (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LISTA kommaseparerad lista av accepterade " "domäner\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LISTA kommaseparerad lista av vägrade domäner\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp följ FTP-länkar frÃ¥n HTML-dokument\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2562,7 +2537,7 @@ msgstr "" " --follow-tags=LISTA kommaseparerad lista av HTML-taggar att " "följa\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2570,20 +2545,20 @@ msgstr "" " --ignore-tags=LISTA kommaseparerad lista av HTML-taggar att\n" " ignorera\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts gÃ¥ till främmande värdar när rekursiv\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative följ endast relativa länkar\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTA lista av tillÃ¥tna kataloger\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2593,84 +2568,84 @@ msgstr "" "ens\n" " sista komponent\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LISTA lista av exkluderade kataloger\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent gÃ¥ inte upp till föräldrakatalogen\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Skicka felrapporter och förslag till \n" "Skicka synpunkter pÃ¥ översättningen till \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, en icke-interaktiv nätverkshämtare.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Lösenord för användaren %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Lösenord: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Kan inte skapa ett rör\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "Fel vid initiering av skapad filÃ¥tgärd för use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Fel när skapad filÃ¥tgärd sattes för use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Fel när svaret lästes frÃ¥n kommandot â€%s %sâ€: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Användarnamn för â€%s%sâ€: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Lösenord för â€%s%s@%sâ€: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Lokalanpassning: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Kompilering: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Länkning: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2679,29 +2654,29 @@ msgstr "" "GNU Wget %s byggd pÃ¥ %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (miljö)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (användare)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (system)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2715,7 +2690,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2723,39 +2698,39 @@ msgstr "" "\n" "Ursprungligen skrivet av Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Skicka felrapporter och frÃ¥gor till .\n" "Skicka synpunkter pÃ¥ översättningen till .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Minnesallokeringsproblem\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Avslutar pÃ¥ grund av fel i %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Prova \"%s --help\" för fler flaggor.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: ogiltig flagga -- \"-n%c\"\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Stöd för felsökning är inte inkompilerat. Ignorerar flaggan --debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2764,7 +2739,7 @@ msgstr "" "BÃ¥de --no-clobber och --convert-links angavs, endast --convert-links kommer " "användas.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2773,22 +2748,22 @@ msgstr "" "BÃ¥de --no-clobber och --convert-file-only angavs, endast --convert-file-only " "kommer användas.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Kan inte vara utförlig och tyst pÃ¥ samma gÃ¥ng.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Kan inte tidsstämpla och inte skriva över gamla filer pÃ¥ samma gÃ¥ng.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Kan inte ange bÃ¥de --inet4-only och --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2800,7 +2775,7 @@ msgstr "" "anges, eller i kombination med -p eller -r. Se manualen för information.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2810,7 +2785,7 @@ msgstr "" "kommer att placeras i en enstaka fil som du har angivit.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2820,12 +2795,7 @@ msgstr "" "för information.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Filen \"%s\" finns redan där; hämtar den inte.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2833,7 +2803,7 @@ msgstr "" "WARC-utdata fungerar inte med --no-clobber, --no-clobber kommer " "avaktiveras.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2841,12 +2811,12 @@ msgstr "" "WARC-utdata fungerar inte med tidsstämplar, tidsstämplar kommer " "avaktiveras.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC-utdata fungerar inte med --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2855,7 +2825,7 @@ msgstr "" "WARC-utdata fungerar inte med --continue eller --start-pos, de kommer " "avaktiveras.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2863,7 +2833,7 @@ msgstr "" "Kontrollsummor är avaktiverade; WARC-avduplicering kommer inte hitta " "dubblettposter.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2872,12 +2842,12 @@ msgstr "" "WARC-utdata fungerar inte med --continue eller --start-pos, de kommer " "avaktiveras.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "Det gÃ¥r inte att ange bÃ¥de --ask-password och --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2886,17 +2856,17 @@ msgstr "" "Att ange bÃ¥de --start-pos och --continue rekommenderas inte; --continue " "kommer att avaktiveras.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL saknas\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "Det gÃ¥r inte att ange bÃ¥de --post-data och --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2906,7 +2876,7 @@ msgstr "" "method. --method förväntar sig data via flaggorna --body-data och --body-" "file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2915,17 +2885,17 @@ msgstr "" "Man mÃ¥ste ange en metod med --method=HTTPMetod att använda med --body-data " "eller --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Det gÃ¥r inte att ange bÃ¥de --body-data och --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Denna version saknar stöd för IRI:er\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2934,7 +2904,7 @@ msgstr "" "vanlig\n" "fil.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2944,42 +2914,42 @@ msgstr "" "med\n" "-O vid skrivning till en vanlig fil.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Misslyckades med att initiera libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Misslyckades med att initiera c-ares-kanalen\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Misslyckades att tolka IP-adressen â€%sâ€\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Misslyckades att sätta DNS-servrar â€%s†(%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Inga URL:er hittade i %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Kunde inte tolka metalink-filen %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Kunde inte hämta alla resurser frÃ¥n %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2990,7 +2960,7 @@ msgstr "" "Total väggklocktid: %s\n" "Hämtade: %d filer, %s pÃ¥ %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Hämtningskvot för %s ÖVERSKRIDEN!\n" @@ -3146,104 +3116,104 @@ msgstr "Filen %s hämtad men signaturen stämmer inte.\n" msgid "Renaming %s to %s.\n" msgstr "Byter namn pÃ¥ %s till %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Fortsätter i bakgrunden.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Fortsätter i bakgrunden, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Utdata kommer att skrivas till %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() misslyckades\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() misslyckades\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Kunde inte hitta användbar uttagsdrivrutin (socket driver).\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() misslyckades. Uttaget kunde inte sättas till blockerande.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: varning: %s-märke förekommer framför alla maskinnamn\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: okänt märke \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Användning: %s NETRC [VÄRDDATORNAMN]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: kan inte ta status pÃ¥ %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "VARNING: använder ett svagt slumpfrö.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Kunde inte sÃ¥ PRNG; överväg att använda --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Din OpenSSL-version är för gammal för att stödja TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Din OpenSSL-version är för gammal för att stödja TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: oimplementerat värde %d pÃ¥ alternativet â€secure-protocolâ€\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: kan inte validera certifikatet för %s, utfärdat av %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Kunde inte lokalt verifiera utfärdarens auktoritet.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Självsignerat certifikat pÃ¥träffades.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Utfärdat certifikat är ännu inte giltigt.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Utfärdat certifikat har gÃ¥tt ut.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3252,14 +3222,14 @@ msgstr "" "%s: inget alternativt namn för certifikatnamnet matchar\n" "\tdet begärda värdnamnet %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: certifikatets namn %s matchar inte det begärda värdnamnet %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3270,13 +3240,13 @@ msgstr "" " Detta kan indikera att värddatorn inte är den som den utger sig\n" " för att vara (den är alltsÃ¥ inte den riktiga %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "För att ansluta till %s pÃ¥ osäkert sätt, använd \"--no-check-certificate\".\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3285,28 +3255,28 @@ msgstr "" "\n" "%*s[ hoppar över %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Punktstilsspecifikationen %s är ogiltig; lämnar oförändrad.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " klar %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " om " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Kan inte hämta REALTIME-klockfrekvens: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Tar bort %s eftersom den skulle ha avvisats.\n" @@ -3320,22 +3290,22 @@ msgstr "Kan inte öppna %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Läser in robots.txt; ignorera fel.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Fel vid tolkning av proxy-URL %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Fel i proxy-URL %s: MÃ¥ste vara HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d omdirigeringar överskreds.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3343,7 +3313,7 @@ msgstr "" "Ger upp.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3351,127 +3321,127 @@ msgstr "" "Försöker igen.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Inget fel" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Schemat %s stöds inte" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Schema saknas" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Ogiltigt värdnamn" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Felaktigt portnummer" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ogiltigt användarnamn" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Oavslutad numerisk IPv6-adress" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6-adresser stöds inte" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ogiltig numerisk IPv6-adress" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS-stöd är inte inkompilerat" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Ofullständig eller ogiltig multibyte-sekvens pÃ¥träffades\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" "%s: %s: Misslyckades med att allokera tillräckligt mycket minne; slut pÃ¥ " "minne.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Misslyckades att allokera %ld byte; minne fullt.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: textbufferten är för stor (%d byte), avbryter.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Fortsätter i bakgrunden, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Misslyckades med att ta bort symboliska länken %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Misslyckades med att initiera libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Misslyckades att tolka IP-adressen â€%sâ€\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Misslyckades att sätta rättigheter pÃ¥ %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Felaktigt reguljärt uttryck %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Fel vid matchning av %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3557,6 +3527,24 @@ msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" "Hittade exakt matchning i CDX-filen. Sparar en Ã¥terbesökspost i WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: flaggan \"--%s\" tar inget argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: okänd flagga \"--%s\"\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: flaggan \"-W %s\" är tvetydig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: flaggan \"-W %s\" tar inget argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Filen \"%s\" finns redan där; hämtar den inte.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/tr.gmo b/po/tr.gmo index 13b99f9..0399c7c 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index d758780..f5b6c62 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-06-27 09:52+0300\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" @@ -25,7 +25,7 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-POOTLE-MTIME: 1494368779.000000\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -33,7 +33,7 @@ msgstr "Bilinmeyen sistem hatası" msgid "Address family for hostname not supported" msgstr "Sunucu adı için adres ailesi desteklenmiyor" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Ä°sim çözümlemesinde geçici bir hata oluÅŸtu" @@ -101,70 +101,45 @@ msgstr "Bir sinyal tarafından iptal edildi" msgid "Parameter string not correctly encoded" msgstr "Parametre dizgesi doÄŸru bir ÅŸekilde kodlanmamış" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Bilinmeyen hata" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: '%s' seçeneÄŸi belirsiz; olasılıklar:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: '%s' seçeneÄŸi belirsiz\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: '--%s' seçeneÄŸi bağımsız deÄŸiÅŸkene izin vermiyor\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: '%s' seçeneÄŸi belirsiz; olasılıklar:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: tanınmayan seçenek '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: '%c%s' seçeneÄŸi bağımsız deÄŸiÅŸkene izin vermiyor\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: '--%s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: tanınmayan seçenek '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: tanınmayan seçenek '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: geçersiz seçenek -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: seçenek bir bağımsız deÄŸiÅŸken gerektiriyor -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: '-W %s' seçeneÄŸi belirsiz\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸkene izin vermiyor\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -184,13 +159,13 @@ msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -262,28 +237,28 @@ msgstr "Düzenli ifade çok büyük" msgid "Unmatched ) or \\)" msgstr "EÅŸleÅŸmeyen ) ya da \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Önceki düzenli ifade yok" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "veriyolu oluÅŸturulamıyor" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s alt süreç baÅŸarısız" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle baÅŸarısız" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "fd geri yüklenemiyor %d: dup2 baÅŸarısız" @@ -302,51 +277,51 @@ msgstr "%s alt süreci %d ölümcül sinyalini aldı" msgid "memory exhausted" msgstr "bellek tükendi" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: %s baÄŸ adresi çözümlenemedi; baÄŸ devre dışı bırakılıyor.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "%s[%s]:%d baÄŸlanılıyor... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "%s:%d baÄŸlanılıyor..." -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "BaÄŸlanılıyor [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF baÅŸarısız: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "baÄŸlantı kuruldu.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "olmadı: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: %s makine adresi çözümlenemedi\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR baÅŸarısız: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,174 +357,174 @@ msgstr "%s silinemedi: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "%s, %s olarak yedeklenemiyor: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "%s için çerez alınamadı\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Set-Cookie'de sözdizimi hatası: %2$d. konumda %1$s.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "%s adresinden gelen çerez alan adını ÅŸu yapmaya çalıştı: " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Çerez dosyası %s açılamadı: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "%s üzerine yazmada hata: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "%s'i kapatmada hata: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Desteklenmeyen listeleme türü, Unix liste çözümleyici deneniyor.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "%2$s:%3$d üstünde /%1$s indeksi" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "zaman bilinmiyor " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Dosya " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Dizin " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "BaÄŸ " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Kesin deÄŸil " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s bayt)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Uzunluk: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) kalan" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s kalan" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (yetkin deÄŸil)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "SSL ilklendirilemedi. Devre dışı bırakılacak." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "%s olarak oturuma giriliyor ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Sunucu yanıtında hata, kontrol baÄŸlantısı kapatılıyor.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Sunucu karşılama iletisinde hata.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Yazma baÅŸarısız, kontrol baÄŸlantısı kapatılıyor.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Sunucu oturum açmayı reddetti.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Oturum açma baÅŸarısız.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Oturum açıldı!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Sunucu 'PBSZ 0' komutunu kabul etmedi.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Sunucu 'PROT %c' komutunu kabul etmedi.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Sunucu hatası, sistem türü saptanamadı.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "tamam. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "tamam.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Tür `%c' bilinmiyor, kontrol baÄŸlantısı kapatılıyor.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "tamam. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD gereksiz.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "getftp()'de mantıksal olarak imkansız bir bölüme ulaşıldı" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -560,7 +535,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -569,37 +544,37 @@ msgstr "" "%s diye bir dizin yok.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD gerekli deÄŸil.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Dosya zaten indirilmiÅŸ.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "PASV aktarımı baÅŸlatılamadı.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "PASV yanıtı çözümlenemedi.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "baÄŸlanılamadı: %s:%d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "BaÄŸlanma hatası (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT geçersiz.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -607,17 +582,17 @@ msgstr "" "\n" "REST baÅŸarısız, baÅŸtan baÅŸlanıyor.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "%s dosyası mevcut.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "%s diye bir dosya yok.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -626,7 +601,7 @@ msgstr "" "%s diye bir dosya yok.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -635,40 +610,40 @@ msgstr "" "%s diye bir dosya veya dizin yok.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s birden ortaya çıktı.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, kontrol baÄŸlantısı kapatılıyor.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Veri baÄŸlantısı: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Kontrol baÄŸlantısı kapatıldı.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Veri aktarımı kesildi.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "%s dosyası zaten orada; indirilmiyor.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(deneme: %2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -677,7 +652,7 @@ msgstr "" "%s (%s) - ÅŸuraya yazıldı stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -686,33 +661,33 @@ msgstr "" "%s (%s) - %s kaydedildi [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "%s kaldırılıyor.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Geçici dosya listelenirken %s kullanılıyor.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s kaldırıldı.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Yineleme derinliÄŸi %d aşıldı. En fazla derinlik %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Uzak dosya %s yerel dosyasından daha yeni deÄŸil -- indirilmiyor.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -721,7 +696,7 @@ msgstr "" "Uzak dosya %s yerel dosyasından daha yeni -- indiriliyor.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -730,11 +705,11 @@ msgstr "" "Uzunlukları aynı deÄŸil (bizdeki %s), -- alınıyor.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Sembolik bağın ismi geçersiz, atlanıyor.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -743,240 +718,240 @@ msgstr "" "Zaten doÄŸru sembolik baÄŸ var: %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Sembolik baÄŸ oluÅŸturuluyor: %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" "Sembolik baÄŸlantılar desteklenmiyor, %s sembolik baÄŸlantısı atlanıyor.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "%s dizini atlanıyor.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: bilinmeyen/desteklenmeyen dosya türü.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: zaman damgası bozuk.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "%d derinliÄŸindeki dizinler alınamayacak (en çok %d)\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "%s dışlandığı/dahil edilmediÄŸi için alçalmıyor.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "%s iptal ediliyor.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s - %s eÅŸleÅŸtirmesinde hata: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Arama kriterine uygun sonuç bulunamadı %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "HTML'leÅŸtirilen dizin %s [%s] içine yazıldı.\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "HTML'leÅŸtirilen dizin %s içine yazıldı.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "HATA: %s dizini açılamıyor.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "HATA: %s sertifikası açılamıyor: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "CA sertifikası '%s' yüklendi\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "HATA: CRL dosyası '%s' yüklenemedi: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "CRL dosyası '%s' yüklendi\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "HATA: GnuTLS, anahtar ve sertifikanın aynı türde olmasını gerektirir.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: uygulanmamış 'secure-protocol' seçeneÄŸi deÄŸeri %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Lütfen bu sorunu bug-wget@gnu.org adresine bildirin.\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: uygulanmamış 'secure-protocol' seçeneÄŸi deÄŸeri %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "HATA" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "DÄ°KKAT" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s tarafından sunulun böyle bir sertifika yok.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s sertifikası güvenilir deÄŸil.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: %s sertifikası bilinen bir yayımcıya ait deÄŸil.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s sertifikası iptal edilmiÅŸ.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: %s sertifikası imzalayanı bir CA deÄŸil.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: %s sertifikası güvensiz bir algoritma kullanılarak imzalanmış.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s sertifikası henüz etkin deÄŸil.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s sertifikasının geçerlilik süresi dolmuÅŸ.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "X509 sertifikası baÅŸlatmada hata: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Hiçbir sertifika bulunamadı\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Sertifika çözümlenmesinde hata: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Sertifika henüz etkinleÅŸtirilmedi\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Sertifikanın kullanım süresi dolmuÅŸ\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Sertifika sahibi host adı ile uyuÅŸmuyor %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Açık anahtar sabitlenen açık anahtarla eÅŸleÅŸmiyor!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Sertifika X.509 olmalıdır\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Adres listesi düzenlemesinde hata.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Bilinmeyen makine" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "%s çözümleniyor... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "olmadı: Makinenin bir IPv4/IPv6 adresi yok.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "olmadı: zamanaşımı.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: İçi boÅŸ %s bağı çözümlenemez.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL `%s' geçersiz: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "HTTP isteÄŸini yazma baÅŸarısız: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "BaÅŸlıklar eksik, HTTP/0.9 olduÄŸu varsayılıyor" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -985,11 +960,11 @@ msgstr "" "%s dosyası mevcut; tekrar indirilmiyor.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime baÅŸarısız. Bu muhtemelen bir hata(bug).\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -997,55 +972,55 @@ msgstr "" "zaman damgası http biçimine dönüştürülemedi. Son deÄŸiÅŸiklik zamanı olarak 0 " "a geri dönülüyor.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "BODY veri dosyası %s kayıp: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "[%s] için mevcut baÄŸlantı yeniden kullanılıyor:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "BaÄŸlantı tekrar kullanılıyor: %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Vekilin yanıtı okunamadı: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s HATA %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Durum satırı bozuk" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Vekil tünellenemedi: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Kimlik tanımlama ÅŸeması bilinmiyor.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Kimlik doÄŸrulama seçildi: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Kayıt yeri: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1054,20 +1029,20 @@ msgstr "" "Ä°mza indirilirken:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Ä°mza içeriÄŸi geçici dosyadan okunamadı. Atlanıyor.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Geçici dosya oluÅŸturulamadı. Ä°mza indirme iÅŸlemi atlanıyor.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Geçersiz pri deÄŸeri. %d varsayılıyor.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1075,42 +1050,42 @@ msgstr "" "Ãœst baÄŸlantı kaynakları için kabul edilebilir özet bulunamadı.\n" "Bunlar gözardı ediliyor.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Ne olduÄŸu belirsiz hatalardan dolayı SSL iptal ediliyor.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s isteÄŸi gönderildi, yanıt bekleniyor... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Hiçbir veri alınmadı.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "BaÅŸlıklar okunurken hata (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(açıklama yok)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Yer: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "belirtilmeyen" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [izleyen]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1119,7 +1094,7 @@ msgstr "" "Dosya %s sunucuda deÄŸiÅŸmedi. Ä°ndirme atlanıyor.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1130,7 +1105,7 @@ msgstr "" "--no-if-modified-since seçeneÄŸini eklemek isteyebilirsiniz.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1140,81 +1115,81 @@ msgstr "" " Dosya zaten alınmıştı; birÅŸey yapılmadı.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Uzunluk: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "yoksayıldı" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Uyarı: HTTP ile genel arama karakterleri kullanılamaz.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Örümcek kipi etkin. Uzak dosyanın mevcut olup olmadığını denetleyin.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "%s (%s) konumuna yazılamıyor.\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Alınan BaÅŸlıktan gerekli nitelik eksik.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "Kullanıcı Adı/Parola Kimlik DoÄŸrulaması BaÅŸarısız.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "WARC dosyasına yazılamıyor.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Geçici WARC dosyasına yazılamıyor.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "SSL baÄŸlantısı kurulamıyor.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "%s (%s) baÄŸlantısı kesilemiyor.\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "HATA: Yönlendirmede (%d) yer belirtilmemiÅŸ.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" "Metalink verisi HTTP yanıtında bulunamadı. Dosya HTTP GET ile indiriliyor.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Metalink baÅŸlıkları bulundu. Metalink moduna geçiliyor.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Uzak dosya bulunamıyor -- kırık adres!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Last-modified baÅŸlığı kayıp -- zaman damgası kapatıldı.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Last-modified baÅŸlığı geçersiz -- zaman damgası yoksayıldı.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1223,16 +1198,16 @@ msgstr "" "Sunucudaki dosya yerel dosya %s ile aynı -- tekrar indirilmiyor.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Uzunlukları aynı deÄŸil (bizdeki %s), -- alınıyor.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Uzak dosya daha yeni, alınıyor.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1242,7 +1217,7 @@ msgstr "" "getiriliyor.\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1250,7 +1225,7 @@ msgstr "" "Uzak dosya buluntu fakat herhangi bir baÄŸlantı içermiyor -- alınamıyor.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1260,7 +1235,7 @@ msgstr "" "fakat önyineleme devredışı -- alınamıyor.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1268,12 +1243,12 @@ msgstr "" "Uzak dosya mevcut.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1282,7 +1257,7 @@ msgstr "" "%s (%s) - stdout %s[%s/%s] içine yazıldı\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1291,58 +1266,58 @@ msgstr "" "%s (%s) - %s kaydedildi [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - %s baytta baÄŸlantı kesildi. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - %s. baytta okuma hatası (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - %s/%s baytta okuma hatası (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Desteklenmeyen koruma kalitesi '%s'.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Desteklenmeyen algoritma '%s'.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC olmayan %s dosyasını gösteriyor.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: %s okunamadı (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: %s dosyasının %d. satırında hata.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: %s dosyasının %d. satırında sözdizimi hatası.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Bilinmeyen komut %s. %s içinde, satır %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1353,7 +1328,7 @@ msgstr "" "'%s' dosyasını denetleyin,\n" "veya --config ile farklı bir dosya belirtin.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1364,47 +1339,47 @@ msgstr "" "'%s' dosyasını denetleyin,\n" "veya --config ile farklı bir dosya belirtin.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Uyarı: Sistem ve kullanıcı wgetrc'si %s konumunu iÅŸaret ediyor.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Geçersiz --execute komutu %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: %s geçersiz deÄŸer; `on' veya `off deÄŸeri kullanın.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: Geçersiz %s; `on', `off' ya da `quiet' kullanın.\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Geçersiz sayı %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s sadece bir defa kullanılmalı\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Geçersiz bayt deÄŸeri %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: %s geçersiz bir zaman aralığı\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1413,28 +1388,28 @@ msgstr "" "use-askpass bir karakter dizisi ya da WGET_ASKPASS veya SSH_ASKPASS ortam " "deÄŸiÅŸkenlerinden birinin ayarlanmasını gerektirir.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Geçersiz deÄŸer %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Geçersiz baÅŸlık bilgisi %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Geçersiz WARC baÅŸlığı %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Geçersiz süreç türü %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1443,40 +1418,40 @@ msgstr "" "%s: %s: Geçersiz kısıtlama %s,\n" " [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii] kullan.\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "%s kodlaması geçerli deÄŸil\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "%s 'ten %s 'e dönüştürme desteklenmiyor\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Tamamlanmamış veya geçersiz çoklu bayt dizisi ile karşılaşıldı\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Bilinmeyen hata kodu %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: yerel ayarlı deÄŸil\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode baÅŸarısız (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Küçük harfe dönüştürme baÅŸarısız:%d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1485,17 +1460,17 @@ msgstr "" "\n" "Çıktı ÅŸuraya yönlendiriliyor: %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; giriÅŸ iptalediliyor.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Kullanımı: %s [SEÇENEK]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1503,68 +1478,68 @@ msgstr "" "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "BaÅŸlangıç:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version Wget sürümünü gösterir ve çıkar\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help bu yardım metnini göster\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background arkaplanda baÅŸlatılır\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=COMMAND `.wgetrc'-tarzı bir komut çalıştır\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Günlük kaydı ve girdi dosyası:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=DOSYA günlük kayıtlarını DOSYA'ya yaz\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=DOSYA iletileri DOSYAya ekle\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug çokça hata ayıklama bilgisi göster\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug Watt-32 hata ayıklama çıktısını yazdır\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet sessiz (çıktı yok)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose ayrıntılı bilgi ver (bu parametre " "öntanımlıdır)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose ayrıntılı bilgi vermeyi kapat, sessiz olmadan\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1572,7 +1547,7 @@ msgstr "" " --report-speed=TÃœR bant geniÅŸliÄŸini TÃœR olarak çık. TÃœR bit " "olabilir\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1580,7 +1555,7 @@ msgstr "" " -i, --input-file=DOSYA yerelde ya da dışarıda bulunan DOSYA " "içerisindeki adresleri indir\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1588,11 +1563,11 @@ msgstr "" " --metalink-file=DOSYA yerel Metalink DOSYAsında belirtilen " "dosyaları indir\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html girdi dosyasının HTML olduÄŸu varsay\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1601,29 +1576,29 @@ msgstr "" "F)\n" " URL'ye baÄŸlı olarak\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=DOSYA kullanılacak yapılandırma dosyasını " "belirt\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config herhangi bir yapılandırma dosyası okuma\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=DOSYA reddedilen URLlerin sebeplerini DOSYAya " "yaz\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Ä°ndirme:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1631,17 +1606,17 @@ msgstr "" " -t, --tries=SAYI yeniden deneme sayısını SAYI olarak ayarla " "(0 sınırsız)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused baÄŸlantı reddedilse bile yeniden dene\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=DOSYA belgeleri DOSYAya yaz\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1649,7 +1624,7 @@ msgstr "" " -nc, --no-clobber varolan dostaların üzerine yazacak\n" " indirmeleri atla (dosyaları ezecek)\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1657,14 +1632,14 @@ msgid "" msgstr "" " --no-config herhangi bir yapılandırma dosyası okuma\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" " -c, --continue parçalı-indirilen dosyayı indirmeye devam et\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1672,11 +1647,11 @@ msgstr "" " --start-pos=UZAKLIK indirmeyi sıfır-tabanlı pozisyon " "UZAKLIK'ından baÅŸlat\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=TÃœR süreç ölçekleme TÃœRünü seç\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1684,7 +1659,7 @@ msgstr "" " --show-progress iÅŸlem çubuÄŸunu herhangi ayrıntı seviyesi " "modunda göster\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1694,7 +1669,7 @@ msgstr "" "yeniden\n" " indirme\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1705,7 +1680,7 @@ msgstr "" " if-modified-since parametresini " "kullanma\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1713,21 +1688,21 @@ msgstr "" " --no-use-server-timestamps yerel dosyanın zaman damgasını sunucu\n" " üzerindekine ayarlama\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response sunucunun yanıtını göster\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider hiçbir ÅŸey indirme\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=SANÄ°YE bütün zaman aşımı deÄŸerlerini SANÄ°YE " "olarak ayarla\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1735,7 +1710,7 @@ msgstr "" " --dns-servers=ADRESLER sorgulanacak DNS sucunuları listesi " "(virgülle ayrılmış)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1743,31 +1718,31 @@ msgstr "" " --bind-dns-address=ADRES yerel makinede DNS çözücüyü ADRES (makine " "adı ya da IP) e baÄŸla\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=SANÄ°YE DNS sorgulama zaman aşımı süzesini " "SANÄ°YE olarak ayarla\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=SANIYE baÄŸlantı zaman aşımı süresini SANIYE " "olarak ayarla\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=SANÄ°YE okuma zaman aşımı süresini SANÄ°YE " "olarak ayarla\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=SANÄ°YE bilgi çekmeler arasında SANÄ°YE kadar " "bekle\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1775,7 +1750,7 @@ msgstr "" " --waitretry=SANÄ°YE bilgi çekme yeniden denemeleri arasında " "1 ..SANÄ°YE bekle\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1783,15 +1758,15 @@ msgstr "" " --random-wait bilgi çekmeler arasında " "0.5*WAIT...1.5*WAIT sn bekle\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy vekil sunucuyu kapat\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=SAYI alım kotasını SAYIya ayarla\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1799,15 +1774,15 @@ msgstr "" " --bind-address=ADRES yerel makinede ADRES (makine ismi ya da IP) e " "baÄŸlan\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=ORAN indirme oranını ORAN olarak sınırla\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache DNS ön belleklemesini kapat\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1815,7 +1790,7 @@ msgstr "" " --restrict-file-names=Ä°S dosya isimlerini Ä°ÅŸletim Sistemi'nin izin " "verdiÄŸi karakterlerle sınırla\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1823,15 +1798,15 @@ msgstr "" " --ignore-case dosya/dizin eÅŸleÅŸtirmesinde büyük/küçük " "harf ayrımını gözardı et\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only sadece IPv4 adreslere baÄŸlan\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only sadece IPv6 adreslere baÄŸlan\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1840,24 +1815,24 @@ msgstr "" " --prefer-family=AÄ°LE önce belirtilen ailedeki adreslere baÄŸlan,\n" " Pv6, IPv4, ya da none arasından biri\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=KULLANICI hem ftp hem de http kullanıcısını " "KULLANICI olarak ayarla\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=PAROLA hem ftp hem de http kullanıcı " "parolasını PAROLA olarak ayarla\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password parola sor\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1875,29 +1850,29 @@ msgstr "" "SSH_ASKPASS \n" " ortam deÄŸiÅŸkenleri kullanılacaktır.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri IRI desteÄŸini kapat\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC IRI'ler için yerel kodlama olarak ENC " "kullan\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=ENC varsayılan uzak kodlama olarak ENC " "kullan\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink dosyayı bozmadan önce kaldır\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1905,7 +1880,7 @@ msgstr "" " --keep-badhash checksum deÄŸerleri eÅŸleÅŸmeyen dosyaları " "koru (.badhash ekle)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1913,7 +1888,7 @@ msgstr "" " --metalink-index=SAYI Ãœst baÄŸlantı uygulaması/metalink4+xml üst " "url sıra SAYISI\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1921,7 +1896,7 @@ msgstr "" " --metalink-over-http HTTP yanıtı baÅŸlıklarından gelen Ãœst " "baÄŸlantı (Metalink) üst verilerini kullan\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" @@ -1929,7 +1904,7 @@ msgstr "" " --preferred-location Ãœst baÄŸlantı (Metalink) kaynakları için " "tercih edilen konum\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1937,59 +1912,59 @@ msgstr "" " --no-xattr geniÅŸletilmiÅŸ dosya özelliklerinde " "üstveri depolamasını kapat\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Dizinler:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories dizin oluÅŸturma\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories dizin oluÅŸturulmasını zorla\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories istemci dizinleri oluÅŸturma\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories dizinlerde protokol ismi kullan\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=ÖNEK dosyaları ÖNEKe kaydet/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" " --cut-dirs=SAYI SAYI kadar uzak dizin bileÅŸenini yoksay\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP seçenekleri:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=KULLANICI http kullanıcısını KULLANICI olarak " "ayarla\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=PAROLA http kullanıcı parolasını PAROLA olarak " "ayarla\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache sunucu veri önbelleklemesine izin verme\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1997,7 +1972,7 @@ msgstr "" " --default-page=Ä°SÄ°M varsayılan ana sayfayı deÄŸiÅŸtir(normalde\n" " bu sayfa 'index.html'dir.)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2005,45 +1980,45 @@ msgstr "" " -E, --adjust-extension HTML/CSS belgelerini uygun uzantılarla " "kaydet\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length 'Content-Length' baÅŸlık alanını yoksay\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" " --header=KARAKTERDÄ°ZÄ°SÄ° baÅŸlıklar boyunca KARAKTERDÄ°ZÄ°SÄ° " "ekle\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=TÃœR süreç ölçekleme TÃœRünü seç\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect sayfa başına izin verilen en fazla " "yönlendirme sayısı\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=Ä°SÄ°M vekil sunucu kullanıcı ismini Ä°SMÄ° olarak " "ayarla\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=PAROLA vekil sunucu kullanıcı parolasını " "PAROLA olarak ayarla\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2051,17 +2026,17 @@ msgstr "" " --referer=URL HTTP isteÄŸine 'Referer: URL' baÅŸlığını da " "ekle\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers HTTP baÅŸlıklarını dosyaya kaydet\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr " -U, --user-agent=AJAN Wget/SÃœRÃœM yerine AJAN olarak tanımla\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2069,22 +2044,22 @@ msgstr "" " --no-http-keep-alive HTTP keep-alive (sürekli baÄŸlantı) özelliÄŸini " "kapat\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies çerezler kullanma.\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=DOSYA çerezleri oturumdan önce DOSYAdan yükle\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=DOSYA oturum sonrası çerezleri DOSYAya kaydet\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2092,7 +2067,7 @@ msgstr "" " --keep-session-cookies oturum (kalıcı-olmayan) çerezlerini yükle " "ve kaydet\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2100,7 +2075,7 @@ msgstr "" " --post-data=KARAKTERDÄ°ZÄ°SÄ° POST metodunu kullan; veri olarak " "KARAKTERDÄ°ZÄ°SÄ°ni gönder\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2108,13 +2083,13 @@ msgstr "" " --post-file=DOSYA POST metodunu kullan; veri olarak DOSYA " "içeriÄŸini gönder\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMetod istekteki \"HTTPMetod\" metodunu kullan\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2122,7 +2097,7 @@ msgstr "" " --body-data=KARAKTERDIZISI veri olarak KARAKTERDÄ°ZÄ°SÄ°ni " "gönder. --method ayalanmış OLMALIDIR\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2130,7 +2105,7 @@ msgstr "" " --body-file=DOSYA DOSYAnın içeriklerini gönder. --method " "AYARLANMALIDIR\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2140,14 +2115,14 @@ msgstr "" " --content-disposition Content-Disposition baÅŸlığını yerel\n" " dosya adları seçerken kabul et (DENEYSEL)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" " --content-on-error sunucu hatalarında alınan içeriÄŸi göster\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2158,11 +2133,11 @@ msgstr "" " sunucu meydan okumasını beklemeden\n" " gönder\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) seçenekleri:\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2172,39 +2147,39 @@ msgstr "" " --secure-protocol=PR güvenlik protokolünü seç, auto, SSLv2,\n" " SSLv3, TLSv1 ve PFS'ten biri\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only sadece güvenli HTTPS baÄŸlantılarını izle\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate sunucu sertifikasını doÄŸrulama\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=DOSYA istemci sertifika dosyası\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TÃœR istemci sertifika türü, PEM ya da DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=DOSYA gizli anahtar dosyası\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=TÃœR gizli anahtar türü, PEM ya da DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=DOSYA CA paketini içeren dosya\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2212,11 +2187,11 @@ msgstr "" " --ca-directory=DÄ°ZÄ°N CA'ların hash listelerinin depolandığı " "dizin\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=DOSYA CRL paketlerini içeren dosya\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2233,7 +2208,7 @@ msgstr "" "sayıda,\n" " base64 ile ÅŸifrelenmiÅŸ sha256 karması\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2241,7 +2216,7 @@ msgstr "" " --random-file=DOSYA SSL PRNG'i beslemek için rastgele veri " "içeren dosya\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2249,26 +2224,26 @@ msgstr "" " --egd-file=FILE EGD soketini isimlendirmek için rastgele " "veri içeren dosya\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS seçenekleri:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts HSTS'i kapat\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" " --hsts-file HSTS veritabanı yolu (varsayılanı ezer)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP seçenekleri:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2276,36 +2251,36 @@ msgstr "" " --ftp-stmlf bütün ikili FTP dosyaları için Stream_LF " "biçimini kullan\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=KULLANICI ftp kullanıcısını KULLANICI olarak " "ayarla\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=PAROLA ftp kullanıcı parolasını PAROLA olarak " "ayarla\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing '.listing' dosyalarını silme\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob FTP dosya ismi arama kalıplarını kapat\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp \"passive\" aktarma modunu kapat\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions uzak dosya izinlerini koru\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2313,11 +2288,11 @@ msgstr "" " --retr-symlinks yineleme sırasında, baÄŸlantılanan " "dosyaları getir (dizinler deÄŸil)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTP seçenekleri:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2325,7 +2300,7 @@ msgstr "" " --ftps-implicit dahili FTPS'i kullan (varsayılan port " "990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2335,7 +2310,7 @@ msgstr "" "kontrol baÄŸlantısında baÅŸlatılan\n" " SSL/TLS oturumunu devam ettir\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2343,7 +2318,7 @@ msgstr "" " --ftps-clear-data-connection sadece kontrol kanalını ÅŸifrele; " "bütün veri düz metin olacak\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2351,11 +2326,11 @@ msgstr "" " --ftps-fallback-to-ftp hedef sunucuda FTPS desteklenmiyorsa " "FTP kullan\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC seçenekleri:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2363,23 +2338,23 @@ msgstr "" " --warc-file=DOSYAADI istek/yanıt verisini bir .warc.gz " "dosyasına kaydet\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=DÄ°ZGE DÄ°ZGEyi warcinfo kaydına ekle\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=SAYI WARC dosyaların azami boyutunu SAYI " "olarak ayarla\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx CDX dizin dosyalarını yaz\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2387,17 +2362,17 @@ msgstr "" " --warc-dedup=DOSYAISMI bu CDX dosyasında listeli kayıtları " "kaydetme\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression WARC dosyalarını GZIP ile sıkıştırma\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests SHA1 özetlerini hesaplama\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2405,7 +2380,7 @@ msgstr "" " --no-warc-keep-log günlük dosyasını bir WARC kaydında " "depolama\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2415,15 +2390,15 @@ msgstr "" "dosyalar\n" " için konum\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Yinelemeli indirme:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive yinelemeli indirmeyi etkinleÅŸtir\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2431,7 +2406,7 @@ msgstr "" " -l, --level=SAYI en fazla yineleme derinliÄŸi (sonsuz için " "inf ya da 0)\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" @@ -2439,7 +2414,7 @@ msgstr "" " --delete-after indirdikten sonra dosyaları yerel olarak " "sil\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2449,7 +2424,7 @@ msgstr "" "baÄŸlantıları yerel\n" " dosyaları gösterecek ÅŸekilde deÄŸiÅŸtir\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2457,7 +2432,7 @@ msgstr "" " --convert-file-only URLlerde sadece dosya kısımlarını " "dönüştür (genellikle basename olarak bilinir)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2465,7 +2440,7 @@ msgstr "" " --backups=N X dosyasını yazmadan önce, N kadar yedek " "dosyası çevir\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2473,7 +2448,7 @@ msgstr "" " -K, --backup-converted X dosyasını dönüştürmeden önce, X_orig " "olarak yedekle\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2481,7 +2456,7 @@ msgstr "" " -K, --backup-converted X dosyasını dönüştürmeden önce, X.orig " "olarak yedekle\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2489,7 +2464,7 @@ msgstr "" " -m, --mirror -N -r -l inf--no-remove-listing için " "kısayol\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2497,7 +2472,7 @@ msgstr "" " -p, --page-requisites HTML sayfada gösterilmesi gerekenleri, " "bütün resimler vs. indir\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2505,11 +2480,11 @@ msgstr "" " --strict-comments HTTP yorumlarının sıkı ÅŸekilde ele " "alınmasını (SGML) aç\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Yinelemeli kabul/red seçenekleri:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2517,7 +2492,7 @@ msgstr "" " -A, --accept=LISTE kabul edilen uzantıların virgülle-" "ayrılmış listesi\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" @@ -2525,48 +2500,48 @@ msgstr "" " -R, --reject=LISTE reddedilen uzantıların virgülle-ayrılmış " "listesi\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=DÃœZENLÄ°Ä°FADE kabul edilen URLler için düzenli " "ifade\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=DÃœZENLÄ°Ä°FADE reddedilen URLler için düzenli " "ifade\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=TÃœR düzenli ifade türü (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=TÃœR düzenli ifade türü (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=LIST kabul edilen alan adlarının virgülle-" "ayrılmış listesi\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=LIST reddedilen alan adlarının virgülle-" "ayrılmış listesi\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp HTML belgelerindeki FTP baÄŸlantılarını " "takip et\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2574,7 +2549,7 @@ msgstr "" " --follow-tags=LISTE takip edilen HTML etiketlerini virgülle-" "ayrılmış listesi\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2582,21 +2557,21 @@ msgstr "" " --ignore-tags=LISTE gözardı edilen HTML etiketlerinin " "virgülle-ayrılmış listesi\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts yinelemeli modda yabancı istemcilere git\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative sadece göreli baÄŸlantıları takip et\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=LISTE izin verilen dizinlerin listesi\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2606,82 +2581,82 @@ msgstr "" "belirtilen\n" " ismi kullan\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=LIST dışlanan dizinlerin listesi\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent bir üst dizine çıkma\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Yazılım hatalarını ve önerilerinizi adresine bildirin\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, bir etkileÅŸimsiz dosya/dizin indirme aracı.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "%s kullanıcısının parolası: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Parola: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "veriyolu oluÅŸturulamıyor\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "use-askpass için oluÅŸturma dosyası eylemlerini baÅŸlatma hatası: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "use-askpass için oluÅŸturma dosyası eylemlerini ayarlama hatası: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "\"%s %s\" komutundan yanıt okuma hatası: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "'%s%s' için kullanıcı adı: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "'%s%s@%s' için kullanıcı parolası: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Yerel: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Derle: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "BaÄŸlantı: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2690,29 +2665,29 @@ msgstr "" "GNU Wget %s, %s üzerinde inÅŸa edildi.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (env)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (kullanıcı)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (sistem)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Telif Hakkı (C) %s Özgür Yazılım Vakfı, AÅž.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2726,7 +2701,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2734,40 +2709,40 @@ msgstr "" "\n" "Özgün olarak Hrvoje Niksic tarafından yazıldı.\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Lütfen hata raporlarını ve sorularınızı adresine " "gönderin.\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Bellek tahsis sorunu\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "%s içindeki hata nedeniyle çıkılıyor\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Daha fazla seçenek için `%s --help' yazın.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: seçenek uygun deÄŸil -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Hata yıklama desteÄŸi derlemeye dahil edilmedi. --debug bayrağı " "yoksayılıyor.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2776,7 +2751,7 @@ msgstr "" "--no-clobber ve --convert-links aynı anda belirtildi, sadece --convert-links " "kullanılacak.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2785,22 +2760,22 @@ msgstr "" "--no-clobber ve --convert-file-only aynı anda belirtildi, sadece -convert-" "file-only kullanılacak.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Hem çok detaylı hem de sessiz olmaz.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Eski dosyaları hem zaman damgalamak hem de dokunmamak olmaz.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Hem --inet4-only hem de --inet6-only olmaz.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2811,7 +2786,7 @@ msgstr "" "-p veya -r ile birlikte belirtilemez. Ayrıntılar için kılavuza bakın.\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2822,7 +2797,7 @@ msgstr "" "belirteceÄŸiniz tek dosyaya kaydedilmesini saÄŸlar.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2833,12 +2808,7 @@ msgstr "" "kılavuza bakın.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "`%s' dosyası zaten var; alınmayacak.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2846,7 +2816,7 @@ msgstr "" "WARC çıktısı --no-clobber ile çalışamayacağından, --no-clobber devre dışı " "bırakılacak.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2854,12 +2824,12 @@ msgstr "" "WARC çıktısı zaman damgası ile çalışamayacağından, zaman damgası devre dışı " "bırakılacak.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC çıktısı --spider ile çalışmaz.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2868,14 +2838,14 @@ msgstr "" "WARC çıktısı --continue ya da --start-pos ile çalışamayacağından, bunlar " "devre dışı bırakılacak.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Özetler devre dışı; WARC kopya kaldırıcı kopya kayıtlarını bulmayacak.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2884,12 +2854,12 @@ msgstr "" "WARC çıktısı --continue ya da --start-pos ile çalışamayacağından, bunlar " "devre dışı bırakılacak.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "--ask-password ve --password seçenekleri birlikte kullanılamaz.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2898,17 +2868,17 @@ msgstr "" "Hem --start-pos hem de --continue belirtmek önerilmez; --continue devre dışı " "bırakılacak.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: URL kayıp\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "--post-data ve --post-file aynı anda kullanılamaz.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2918,7 +2888,7 @@ msgstr "" "kullanamazsınız. --method, --body-data ve --body-file seçenekleri ile veri " "bekler\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2927,17 +2897,17 @@ msgstr "" "--body-data veya --body-file ile kullanılabilmesi için --method=HTTPMethod " "ile bir yöntem belirtmelisiniz.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "--body-data ve --body-file aynı anda kullanılamaz.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Bu sürüm IRI'ler için destek sunmuyor\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2946,7 +2916,7 @@ msgstr "" "birlikte\n" "kullanılabilir.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2956,42 +2926,42 @@ msgstr "" "dosyaya çıktı alınıyorsa birlikte\n" "kullanılabilir.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "libcares ilklendirilemedi\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "c-ares kanalı ilklendirilemedi\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "'%s' IP adresi çözümlenemedi\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "DNS sunucu(ları) '%s' (%d) ayarlanamadı\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "%s de URL yok.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ãœst baÄŸlantı dosyası %s çözümlenemedi.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "%s'den bütün kaynaklar indirilemedi\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3002,7 +2972,7 @@ msgstr "" "Toplam duvar saati zamanı: %s\n" "Ä°ndirilen: %d dosya, %s, %s (%s) içerisinde\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "Dosya indirme kotası %s AÅžILDI!\n" @@ -3158,105 +3128,105 @@ msgstr "%s dosyası alındı ancak imza eÅŸleÅŸmiyor.\n" msgid "Renaming %s to %s.\n" msgstr "%s, %s olarak yeniden adlandırılıyor.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Ardalanda sürüyor.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Ä°ÅŸlem PID %lu ile artalanda sürüyor.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Çıktı ÅŸuraya yazılacak: %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() baÅŸarısız\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() baÅŸarısız\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Kullanılabilir soket sürücü bulunamadı.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() baÅŸarısız. Yuva, engelleyici olarak ayarlanamadı.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" "%s: %s:%d: uyarı: %s andacı herhangi bir makine adından önce görünüyor\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: bilinmeyen dizgecik \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Kullanım: %s NETRC [MAKÄ°NA-ADI]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: %s durumlanamadı: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "DÄ°KKAT: rasgele sayı üreteci yeterli deÄŸil.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Rasgele sayı üreteci tohumlanamadı; --random-file kullanılabilir.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "OpenSSL versiyonunuz TLSv1.1'i destemek için çok eski.\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "OpenSSL versiyonunuz TLSv1.2'i destemek için çok eski.\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: uygulanmayan 'secure-protocol' seçenek deÄŸeri %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: %s sertifikası doÄŸrulanamıyor. %s tarafından saÄŸlanmış:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Yerel olarak saÄŸlayıcının kimliÄŸi doÄŸrulanamıyor.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Kendinden imzalı sertifika tespit edildi.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Verilen sertifika henüz geçerli deÄŸil.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Verilen sertifikanın süresi dolmuÅŸ.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3265,14 +3235,14 @@ msgstr "" "%s: sertifika konu alternatif ismi istenen\n" "\tmakine adı %s ile eÅŸleÅŸmiyor.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" " %s: ortak sertifika adı %s, istenen makine adı %s ile eÅŸleÅŸmiyor.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3283,14 +3253,14 @@ msgstr "" " Bu, olduÄŸunu iddia ettiÄŸi sunucu olmama göstergesi olabilir\n" " (gerçek %s deÄŸil demektir).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "%s adresine güvenliÄŸi gözardı ederek baÄŸlanmak için `--no-check-certificate' " "seçeneÄŸini kullanın.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3299,28 +3269,28 @@ msgstr "" "\n" "%*s[ atlanıyor %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Geçersiz nokta biçem niteliÄŸi %s; deÄŸiÅŸtirilmeden bırakılıyor.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " kalan %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " içinde " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "RTC saptanamadı: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "ReddedileceÄŸinden %s kaldırılıyor.\n" @@ -3334,22 +3304,22 @@ msgstr "%s açılamıyor: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "robots.txt yükleniyor; lütfen hataları yoksayın.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Vekil URLsi %s çözümlenirken hata: %s\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Vekil URLsi %s: HTTP olmalı.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d yönlendirme geçildi.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3357,7 +3327,7 @@ msgstr "" "Vazgeçiliyor.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3365,125 +3335,125 @@ msgstr "" "Tekrarlanıyor.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Hata yok" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Desteklenmeyen ÅŸema %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Åžema eksik" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Makine ismi geçersiz" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Port numarası hatalı" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Kullanıcı ismi geçersiz" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "IPv6 sayısal adresi sonlandırılmamış" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 adresler desteklenmiyor" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "IPv6 sayısal adresi geçersiz" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "HTTPS desteÄŸi derlenirken eklenmemiÅŸ" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Tamamlanmamış veya geçersiz çoklu bayt dizisi ile karşılaşıldı\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Yeterince bellek ayırma baÅŸarısız; bellek yoruldu.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: %ld baytı ayırmak mümkün olmadı; bellek tükenmiÅŸ olabilir.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: metin tamponu çok büyük (%d bytes), iptal ediliyor.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Ardalanda sürüyor, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Symlink %s baÄŸlantısı kaldırılamıyor: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "libcares ilklendirilemedi\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "'%s' IP adresi çözümlenemedi\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "%s için izinler ayarlanamadı.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Geçersiz düzenli ifade %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "%s eÅŸleÅŸtirilirken hata: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3565,6 +3535,24 @@ msgstr "" "CDX dosyasında tam eÅŸleÅŸme bulundu. Tekrar ziyaret kaydı WARC'a " "kaydediliyor.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: '--%s' seçeneÄŸi bağımsız deÄŸiÅŸkene izin vermiyor\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: tanınmayan seçenek '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: '-W %s' seçeneÄŸi belirsiz\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸkene izin vermiyor\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: '-W %s' seçeneÄŸi bağımsız bir deÄŸiÅŸken gerektiriyor\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "`%s' dosyası zaten var; alınmayacak.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/uk.gmo b/po/uk.gmo index 47563cc..38885cc 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 171be07..946a3ba 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-17 19:30+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -21,7 +21,7 @@ msgstr "" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ðевідома ÑиÑтемна помилка" @@ -29,7 +29,7 @@ msgstr "Ðевідома ÑиÑтемна помилка" msgid "Address family for hostname not supported" msgstr "Підтримки ÑімейÑтва назв вузлів не передбачено" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "ТимчаÑова помилка розв'ÑÐ·Ð°Ð½Ð½Ñ Ð½Ð°Ð·Ð²" @@ -97,74 +97,47 @@ msgstr "Перервано за Ñигналом" msgid "Parameter string not correctly encoded" msgstr "Помилкове ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ñдка параметрів" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Ðевідома помилка" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: неоднозначний параметр '%s'; можливі варіанти:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: параметр «%s» не Ñ” однозначним\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '--%s' не передбачено\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: неоднозначний параметр '%s'; можливі варіанти:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +# +option or -option +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: нерозпізнаний параметр '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '%c%s' не передбачено\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: до параметра '--%s' Ñлід додати аргумент\n" -# --option -# --option -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: нерозпізнаний параметр '--%s'\n" - -# +option or -option -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: нерозпізнаний параметр '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: некоректний параметр -- '%c'\n" # 1003.2 specifies the format of this message. -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: до параметра Ñлід додати аргумент -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: неоднозначний параметр '-W %s'\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '-W %s' не передбачено\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: до параметра '-W %s' Ñлід додати аргумент\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -184,13 +157,13 @@ msgstr "%s: до параметра '-W %s' Ñлід додати аргумен #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -262,28 +235,28 @@ msgstr "Занадто об’ємний формальний вираз" msgid "Unmatched ) or \\)" msgstr "Ðеврівноважена дужка ) або \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Ðе виÑвлено попереднього формального виразу" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "не вдалоÑÑ Ñтворити канал" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "Помилка підпроцеÑу %s" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "Помилка _open_osfhandle" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ файловий деÑкриптор %d: помилка dup2" @@ -302,51 +275,51 @@ msgstr "ПідпроцеÑом %s отримано Ñигнал щодо ава msgid "memory exhausted" msgstr "недоÑтатньо пам'ÑÑ‚Ñ–" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: неможливо визначити адреÑу bind %s; вимикаємо bind.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "помилка SO_RCVBUF setsockopt: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "з’єднано.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "невдача: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: неможливо розв'Ñзати адреÑу вузла %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "помилка SO_REUSEADDR setsockopt: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,176 +355,176 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ копію %s із назвою %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ кукі Ð´Ð»Ñ %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "СинтакÑична помилка в куках: %s в позиції %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Кука, що надійшла з %s, визначає домен " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл з куками %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Помилка запиÑу в %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Помилка Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Тип ліÑтингу невідомий, Ñпроба розібрати в Ñтилі ліÑтингу Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Покажчик каталогу /%s на %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "Ñ‡Ð°Ñ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Файл " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "Каталог " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Ðеточно " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s байт)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Довжина: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", %s (%s) залишилоÑÑŒ" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", %s залишилоÑÑŒ" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (не точно)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ SSL. Протокол буде вимкнено." # Second: Login with proper USER/PASS sequence. # Second: Login with proper USER/PASS sequence. -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Входимо Ñк %s ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Помилка в реакції Ñервера, Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐºÐµÑ€Ñ–Ð²Ð½Ð¾Ð³Ð¾ з'єднаннÑ.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Помилка в привітанні Ñервера.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Помилка запиÑу, Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐºÐµÑ€Ñ–Ð²Ð½Ð¾Ð³Ð¾ з'єднаннÑ.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Сервер відмовив у реєÑтрації.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Ðекоректне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð²Ð´Ð°Ð»Ð°ÑÑŒ!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Сервер не прийнÑв команду «PBSZ 0».\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Сервер не прийнÑв команду «PROT %c».\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Помилка Ñервера, не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ тип ÑиÑтеми.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "зроблено. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "зроблено.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Ðевідомий тип `%c', Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐºÐµÑ€Ñ–Ð²Ð½Ð¾Ð³Ð¾ з'єднаннÑ.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "зроблено. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> CWD не потрібно.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "У getftp() виÑвлено логічно неможливий розділ" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -562,7 +535,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -573,37 +546,37 @@ msgstr "" # do not CWD # do not CWD -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> CWD не вимагаєтьÑÑ.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Файл вже отримано.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ PASV-передачу.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Помилка ÑинтакÑичного аналізу відповіді PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "не вдалоÑÑ Ð¿Ñ–Ð´'єднатиÑÑ Ð´Ð¾ %s:%d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Помилка зв'ÑÐ·ÑƒÐ²Ð°Ð½Ð½Ñ (%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Ðекоректний PORT.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -611,17 +584,17 @@ msgstr "" "\n" "Команда REST не вдалаÑÑŒ, починаємо з нулÑ.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Файл %s Ñ–Ñнує.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Файл %s відÑутній.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -630,7 +603,7 @@ msgstr "" "Файл %s відÑутній.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -639,40 +612,40 @@ msgstr "" "Файл чи каталог %s відÑутній.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s почав Ñвоє Ñ–ÑнуваннÑ.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÐºÐµÑ€Ñ–Ð²Ð½Ð¾Ð³Ð¾ з'єднаннÑ.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - З'єднаннÑ: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Керівне з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¾.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Передачу даних перервано.\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Файл %s вже Ñ” тут, не завантажуємо.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(Ñпроба:%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -681,7 +654,7 @@ msgstr "" "%s (%s) - запиÑаний до stdout %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -690,36 +663,36 @@ msgstr "" "%s (%s) - %s збережено [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "СпиÑок буде збережено до тимчаÑового файла %s.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "%s вилучено.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Глибина рекурÑÑ–Ñ— %d перевищила макÑимальну глибину %d.\n" # Remote file is older, file sizes can be compared and # are both equal. -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "Локальний файл %s новіший -- не завантажуємо його.\n" # Remote file is newer or sizes cannot be matched -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -730,7 +703,7 @@ msgstr "" # Sizes do not match # Sizes do not match -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -739,11 +712,11 @@ msgstr "" "Розмір файлів не збігаєтьÑÑ (локальний: %s) -- завантажуємо.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Ðекоректна назва Ñимвольного поÑиланнÑ, пропуÑкаємо.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -752,52 +725,52 @@ msgstr "" "Символьне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s -> %s вже Ñ–Ñнує.\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Створюємо Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Символьні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ підтримуютьÑÑ, пропуÑкаємо Ñ—Ñ… %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "ПропуÑкаємо каталог %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: невідомий тип файлу (або не підтримуєтьÑÑ).\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: пошкоджена мітка чаÑу.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Ðе завантажуємо каталоги оÑкільки глибина вже %d (макÑимум %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Ðе виконуємо вхід до %s, оÑкільки його виключено або не включено.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "ПропуÑкаємо %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Помилка вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ– %s %s: %s\n" @@ -805,192 +778,192 @@ msgstr "Помилка вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ– %s %s # No luck. # #### This message SUCKS. We should see what was the # reason that nothing was retrieved. -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Ðемає збігів з шаблоном %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Покажчик у форматі HTML запиÑано до файла %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Покажчик у форматі HTML запиÑано до файла %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ каталог %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñертифікат %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Завантажено Ñертифікат CA «%s»\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "ПОМИЛКÐ: не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ файл CRL «%s»: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Завантажено файл CRL «%s»\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" "ПОМИЛКÐ: GnuTLS вимагає, щоб ключ Ñ– Ñертифікат належали до одного типу.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" "GnuTLS: нереалізоване у програмі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Будь лаÑка, повідомте про цю ваду за адреÑою bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" "GnuTLS: нереалізоване у програмі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "ПОМИЛКÐ" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "УВÐГÐ" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s не надано жодних Ñертифікатів.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Сертифікат %s не довірений.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Ñертифікат %s видано невідомим видавцем.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Ñертифікат %s було відкликано.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: підпиÑувачем Ñертифіката %s не Ñ” Ñлужба Ñертифікації.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" "%s: Ñертифікат %s було підпиÑано за допомогою незахищеного алгоритму.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Ñертифікат %s ще не активовано.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Ñтрок дії Ñертифіката %s вичерпано.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Помилка ініціалізації Ñертифікату X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Сертифікат не знайдено\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Помилка розбору Ñертифікату: %s.\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Сертифікат ще не було активовано\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Сертифікат проÑтрочений\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð²Ð»Ð°Ñника Ñертифіката не відповідає назві вузла %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Відкритий ключ не збігаєтьÑÑ Ñ–Ð· приєднаним відкритим ключем!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Сертифікат має належати до типу X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Помилка під Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸ ÑпиÑку адреÑ.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Ðевідомий вузол" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸ %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "невдача: Ð”Ð»Ñ Ð²ÑƒÐ·Ð»Ð° відÑÑƒÑ‚Ð½Ñ IPv4/IPv6 адреÑа.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "невдача: тайм-аут.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ неповне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: Ðекоректний URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Помилка запиÑу HTTP-запиту: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "ВідÑутні заголовки, припуÑкаєтьÑÑ, що це HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -999,11 +972,11 @@ msgstr "" "Файл '%s' вже Ñ” тут, не завантажуємо.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "Помилка gmtime. Ймовірно, маємо Ñправу із вадою у програмі.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -1011,55 +984,55 @@ msgstr "" "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ чаÑову позначку у формат http. ВикориÑтовуємо Ñ‡Ð°Ñ 0, " "Ñк Ñ‡Ð°Ñ Ð²Ð½ÐµÑÐµÐ½Ð½Ñ Ð¾Ñтанніх змін.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Ðе виÑтачає файла даних BODY %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Повторне викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð²'Ñзку з [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Повторне викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð²'Ñзку з %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Ðе вдалоÑÑŒ прочитати відповідь від прокÑÑ–: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s ПОМИЛКР%d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ÐеÑформований Ñ€Ñдок Ñтану" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Помилка Ñ‚ÑƒÐ½ÐµÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-Ñервера: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Ðевідома Ñхема аутентифікації.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Вибраний ÑпоÑіб розпізнаваннÑ: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Зберігаємо до %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1068,21 +1041,21 @@ msgstr "" "Під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ вміÑÑ‚ підпиÑу до тимчаÑового файла. ПропуÑкаємо.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Ðе вдалоÑÑ Ñтворити тимчаÑовий файл. ПропуÑкаємо Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу.\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ pri. ПрипуÑкаємо Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1090,42 +1063,42 @@ msgstr "" "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ прийнÑтну контрольну Ñуму Ð´Ð»Ñ Ñ€ÐµÑурÑів Metalink.\n" "Ігноруємо Ñ—Ñ….\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Вимикаємо SSL через помилки.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "%s-запит надіÑлано, очікуємо на відповідь… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Ðе отримано даних.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² заголовках (%s).\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(без опиÑу)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "РозміщеннÑ: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "не вказано" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [перехід]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1134,7 +1107,7 @@ msgstr "" "Файл %s не змінено на Ñервері. ПропуÑкаємо процедуру отриманнÑ.\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1145,7 +1118,7 @@ msgstr "" "Ймовірно, Ñлід додати до команди параметр --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1158,62 +1131,62 @@ msgstr "" # No need to print this output if the body won't be # downloaded at all, or if the original server response is # printed. -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Довжина: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "ігноруєтьÑÑ" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Увага: в HTTP не підтримуютьÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" "Увімкнено режим «павука». Перевірка, чи Ñ–Ñнує файл на віддаленому " "комп'ютері.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Помилка запиÑу в %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "У отриманому заголовку не виÑтачає потрібного Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ атрибута.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" "Спроба пройти Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ð·Ð° іменем кориÑтувача Ñ– паролем зазнала " "невдачі.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дані до файла WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ тимчаÑового файла WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити SSL-з'єднаннÑ.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "неможливо видалити %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "ПОМИЛКÐ: ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ (%d) без Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð´Ñ€ÐµÑи.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1221,23 +1194,23 @@ msgstr "" "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дані Metalink у HTTP-відповіді. Отримуємо файл за " "допомогою GET HTTP.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "ВиÑвлено заголовки Metalink. ПеремикаємоÑÑ Ñƒ режим Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Віддалений файл не Ñ–Ñнує -- пошкоджене поÑиланнÑ!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "ВідÑутній заголовок last-modified -- мітки чаÑу вимкнено.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Ðекоректний заголовок last-modified -- ігноруємо мітки чаÑу.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1246,17 +1219,17 @@ msgstr "" "Локальний файл %s новіший -- не завантажуємо його.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Довжини файлів не збігаютьÑÑ (локальний %s) -- завантажуємо.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Файл новіший, ніж локальний, завантажуємо.\n" # Remote file is newer or sizes cannot be matched -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1268,7 +1241,7 @@ msgstr "" # Remote file is older, file sizes can be compared and # are both equal. -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1276,7 +1249,7 @@ msgstr "" "Віддалений файл Ñ–Ñнує, але не міÑтить поÑилань -- не завантажуємо.\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1286,7 +1259,7 @@ msgstr "" "але рекурÑÑ–ÑŽ вимкнено -- не завантажуємо.\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1294,12 +1267,12 @@ msgstr "" "Віддалений файл Ñ–Ñнує.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1308,7 +1281,7 @@ msgstr "" "%s (%s) - Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ stdout %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1317,58 +1290,58 @@ msgstr "" "%s (%s) - %s збережено [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¾ в позиції %s байт. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Помилка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð² позиції %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Ðепідтримувана ÑкіÑÑ‚ÑŒ захиÑту «%s».\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Ðепідтримуваний алгоритм «%s».\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC вказує на %s, що наÑправді не Ñ–Ñнує.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Ðеможливо прочитати %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Помилка в %s (Ñ€Ñдок %d).\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: помилка ÑинтакÑиÑу у %s (Ñ€Ñдок %d).\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Ðевідома команда %s в %s (Ñ€Ñдок %d).\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1380,7 +1353,7 @@ msgstr "" "«%s»,\n" "або вкажіть інший файл за допомогою --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1391,48 +1364,48 @@ msgstr "" "«%s»,\n" "або вкажіть інший файл за допомогою --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" "%s: Увага: Як ÑиÑтемний wgetrc так Ñ– wgetrc кориÑтувача вказують на %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: некоректна команда в --execute %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Ðекоректне булеве %s, вкажіть `on' чи `off'.\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: некоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s; мало бути «on», «off» або «quiet».\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Ðекоректне чиÑло %s.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s має бути викориÑтано лише один раз\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±Ð°Ð¹Ñ‚Ð° %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Ðекоректний період чаÑу %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1441,28 +1414,28 @@ msgstr "" "use-askpass потребує Ñ€Ñдка або вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ñередовища WGET_ASKPASS " "або SSH_ASKPASS.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Ðекоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Ðекоректний заголовок %s.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: некоректний заголовок WARC, %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Ðекоректний тип ÑÑ‚Ð¸Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ поÑтупу %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1471,40 +1444,40 @@ msgstr "" "%s: %s: Ðекоректне Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ %s,\n" " вкажіть [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ %s Ñ” некоректним\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Підтримки Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð· %s на %s не передбачено\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "ВиÑвлено неповну або некоректну багатобайтову поÑлідовніÑÑ‚ÑŒ\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Ðеопрацьована помилка (errno %d)\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: локаль не вÑтановлено\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "Помилка у idn_encode (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ на нижній регіÑÑ‚Ñ€: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1513,17 +1486,17 @@ msgstr "" "\n" "ПеренаправлÑємо Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; вимикаємо протоколюваннÑ.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "ВикориÑтаннÑ: %s [ПÐРÐМЕТР]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1532,64 +1505,64 @@ msgstr "" "коротких.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "ЗапуÑк:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version показати дані щодо верÑÑ–Ñ— Wget Ñ– вийти\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help вивеÑти цю підказку\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background перейти в фоновий режим піÑÐ»Ñ Ð·Ð°Ð¿ÑƒÑку\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=КОМÐÐДРвиконати команду типу .wgetrc\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚Ð° вхідний файл:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=ФÐЙЛ запиÑувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñƒ ФÐЙЛ\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=ФÐЙЛ додавати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ ФÐЙЛа.\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug виводити багато діагноÑтичної " "інформації.\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug вивеÑти діагноÑтичні дані у форматі " "Watt-32\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" " -q, --quiet працювати без Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose докладне Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ (типове)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" @@ -1597,7 +1570,7 @@ msgstr "" " -nv, --no-verbose вимкнути докладні повідомленнÑ, але не " "вимикати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ð·Ð°Ð³Ð°Ð»Ñ–.\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1605,7 +1578,7 @@ msgstr "" " --report-speed=ТИП вивеÑти ширину каналу у форматі ТИП. " "ТИПом може бути «bits».\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1613,7 +1586,7 @@ msgstr "" " -i, --input-file=ФÐЙЛ читати URL з локального або зовнішнього " "файла\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1621,12 +1594,12 @@ msgstr "" " --input-metalink=ФÐЙЛ файли Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñƒ локальному файлі " "Metalink\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" " -F, --force-html вважати файл вхідних даних файлом HTML\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1635,27 +1608,27 @@ msgstr "" "(-i -F)\n" " відноÑно адреÑи ÐДРЕСÐ.\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=FILE вказати файл налаштувань.\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config не читати дані з файла налаштувань\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=ФÐЙЛ запиÑувати до журналу причини відмови в " "адреÑÑ– у ФÐЙЛі\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "ЗавантаженнÑ:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" @@ -1663,18 +1636,18 @@ msgstr "" " -t, --tries=ЧИСЛО обмежити кількіÑÑ‚ÑŒ повторних Ñпроб (0 — " "не обмежувати)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" " --retry-connrefused повторювати, навіть Ñкщо у з'єднанні " "відмовлено\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=ФÐЙЛ запиÑувати документи до ФÐЙЛа\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1682,7 +1655,7 @@ msgstr "" " -nc, --no-clobber пропуÑкати файли, Ñкі вже Ñ–Ñнують\n" " (не перезапиÑувати).\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1690,7 +1663,7 @@ msgid "" msgstr "" " --no-config не читати дані з файла налаштувань\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1699,7 +1672,7 @@ msgstr "" "завантаженого\n" " файлу\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1707,13 +1680,13 @@ msgstr "" " --start-pos=ЗСУВ почати Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð· позиції ЗСУВ (відлік " "від нулÑ)\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" " --progress=ТИП задати ТИП індикатора візуалізації\n" " процеÑу роботи\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" @@ -1721,7 +1694,7 @@ msgstr "" " --progress=ТИП задати ТИП індикатора візуалізації\n" " процеÑу роботи\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1730,7 +1703,7 @@ msgstr "" " -N, --timestamping не завантажувати файли, Ñкі Ñтарші, ніж\n" " локальні\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1740,7 +1713,7 @@ msgstr "" "змінено-з\n" " у режимі чаÑових позначок\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1749,20 +1722,20 @@ msgstr "" "локального\n" " файла за даними з Ñервера\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response виводити відповідь Ñервера\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider нічого не завантажувати\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1770,7 +1743,7 @@ msgstr "" " --dns-servers=ÐДРЕСИ ÑпиÑок Ñерверів DNS Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ " "запитів (відокремлених комами)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1779,28 +1752,28 @@ msgstr "" "адреÑою (назва вузла або IP)\n" " локального вузла\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " "DNS\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° з’єднаннÑ\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" " --read-timeout=СЕКУÐДИ вÑтановити Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° читаннÑ\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=СЕКУÐДИ вÑтановити затримку між завантаженнÑми\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" @@ -1808,7 +1781,7 @@ msgstr "" " --waitretry=СЕКУÐД зачекати 1...СЕКУÐД між Ñпробами " "отриманнÑ\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1816,17 +1789,17 @@ msgstr "" " --random-wait зачекати 0.5*WAIT...1.5*WAIT cек. між " "Ñпробами\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy вимкнути прокÑÑ– Ñвним чином\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=ЧИСЛО вÑтановити квоту Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñƒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " "ЧИСЛО\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1834,15 +1807,15 @@ msgstr "" " --bind-address=ÐДРЕСРприв'Ñзка до адреÑи (назва вузла або IP)\n" " локального вузла\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=ШВИДКІСТЬ обмежити швидкіÑÑ‚ÑŒ завантаженнÑ\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache вимкнути ÐºÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ DNS запитів\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1851,7 +1824,7 @@ msgstr "" "дозволеними\n" " у відповідній ОС\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1859,15 +1832,15 @@ msgstr "" " --ignore-case ігнорувати регіÑÑ‚Ñ€ при переглÑді\n" " файлів/каталогів\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only з'єднуватиÑÑŒ лише з IPv4 адреÑами\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only з'єднуватиÑÑŒ лише з IPv6 адреÑами\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1877,24 +1850,24 @@ msgstr "" "ÑімейÑтва\n" " адреÑ: IPv6, IPv4, або none\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ ftp та " "http\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ кориÑтувача Ð´Ð»Ñ ftp та " "http\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password запитувати пароль\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1912,29 +1885,29 @@ msgstr "" "Ñередовища \n" " WGET_ASKPASS або SSH_ASKPASS.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri вимкнути підтримку IRI\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=КДРвикориÑтовувати локальне ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ÐšÐ”Ð " "Ð´Ð»Ñ IRI\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=КДРвикориÑтовувати КДРÑк типове віддалене " "кодуваннÑ\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink вилучати файл до перезапиÑу\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1942,7 +1915,7 @@ msgstr "" " --keep-badhash не вилучати файли із невідповідними " "контрольними Ñумами (Ð´Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1950,7 +1923,7 @@ msgstr "" " --metalink-index=ЧИСЛО вказати порÑдковий номер метаадреÑи " "програми metalink або metalink4+xml\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1958,14 +1931,14 @@ msgstr "" " --metalink-over-http викориÑтовувати метадані Metalink із " "заголовків HTTP-відповіді\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" " --preferred-location бажане міÑце Ð´Ð»Ñ Ñ€ÐµÑурÑів Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1973,34 +1946,34 @@ msgstr "" " --no-xattr вимкнути Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð¸Ñ… у " "розширених атрибутах файла\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "Каталоги:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories не Ñтворювати каталоги\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories примуÑове ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð²\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" " -nH, --no-host-directories не Ñтворювати каталоги з назвами вузлів\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" " --protocol-directories викориÑтовувати назву протоколу у назвах " "каталогів\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=PREFIX зберігати файли в PREFIX/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" @@ -2008,26 +1981,26 @@ msgstr "" " --cut-dirs=ЧИСЛО ігнорувати певне ЧИСЛО компонентів " "каталогу\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Параметри HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=ІМ'Я вÑтановити ІМ'Я http-кориÑтувача\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ Ð´Ð»Ñ http-запитів\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache заборонити ÐºÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… на боці " "Ñервера\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -2035,7 +2008,7 @@ msgstr "" " --default-page=ÐÐЗВРзмінити типову назву Ñторінки (зазвичай,\n" " назвою Ñ” «index.html».)\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2044,18 +2017,18 @@ msgstr "" "відповідним\n" " розширеннÑм\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length ігнорувати поле заголовку `Content-" "Length'\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=РЯДОК вÑтавлÑти РЯДОК в HTTP-заголовки\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " @@ -2064,25 +2037,25 @@ msgstr "" " --progress=ТИП задати ТИП індикатора візуалізації\n" " процеÑу роботи\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect макÑимальна кількіÑÑ‚ÑŒ переÑпрÑмувань на " "Ñторінку\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-" "Ñервера\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐºÑÑ–-Ñервера\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2090,19 +2063,19 @@ msgstr "" " --referer=URL включити заголовок «Referer: URL» " "заголовок до HTTP-запиту\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" " --save-headers запиÑувати HTTP-заголовки до файла\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" " -U, --user-agent=ÐГЕÐТ задати ім'Ñ ÐГЕÐТа заміÑÑ‚ÑŒ Wget/ВЕРСІЯ\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" @@ -2110,21 +2083,21 @@ msgstr "" " --no-http-keep-alive заборонити HTTP keep-alive (поÑтійні " "з'єднаннÑ)\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies не викориÑтовувати куки\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=ФÐЙЛ перед ÑеÑією брати куки з ФÐЙЛа\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=ФÐЙЛ в кінці ÑеÑÑ–Ñ— запиÑати куки у ФÐЙЛ\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2132,7 +2105,7 @@ msgstr "" " --keep-session-cookies завантажувати Ñ– зберігати (тимчаÑово) " "куки ÑеанÑів\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2140,7 +2113,7 @@ msgstr "" " --post-data=РЯДОК викориÑтовувати метод POST; надіÑлати " "РЯДОК Ñк дані\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2148,13 +2121,13 @@ msgstr "" " --post-file=ФÐЙЛ викориÑтовувати метод POST; надіÑлати " "вміÑÑ‚ ФÐЙЛа\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=МетодHTTP викориÑтовувати у запиті ÑпоÑіб «МетодHTTP»\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2162,7 +2135,7 @@ msgstr "" " --body-data=РЯДОК надіÑлати РЯДОК Ñк дані. ÐœÐЄ бути " "вÑтановлено --method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2170,7 +2143,7 @@ msgstr "" " --body-file=ФÐЙЛ надіÑлати вміÑÑ‚ файла ФÐЙЛ. СЛІД " "вÑтановити параметр --method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2182,7 +2155,7 @@ msgstr "" " Ñ‡Ð°Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ назв локальних файлів " "(ТЕСТОВРМОЖЛИВІСТЬ)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2190,7 +2163,7 @@ msgstr "" " --content-on-error виводити отримані дані у разі помилок з " "Ñервером\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2201,11 +2174,11 @@ msgstr "" "HTTP,\n" " не чекаючи на запит з Ñервера\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Параметри HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2216,41 +2189,41 @@ msgstr "" "SSLv2,\n" " SSLv3, TLSv1 та PFS\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only переходити лише за безпечними поÑиланнÑми " "HTTPS\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate не перевірÑти Ñерверний Ñертифікат\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=ФÐЙЛ файл Ñертифіката клієнта\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=TYPE тип Ñертифіката клієнта, PEM або DER\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=ФÐЙЛ файл закритого ключа\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=ТИП тип закритого ключа, PEM або DER\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=ФÐЙЛ файл з комплектом CA\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" @@ -2258,11 +2231,11 @@ msgstr "" " --ca-directory=КÐТÐЛОГ каталог, у Ñкому зберігаєтьÑÑ ÑпиÑок " "хешів Ñлужб Ñертифікації (CA)\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --crl-file=ФÐЙЛ файл з комлектом CRL.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2281,7 +2254,7 @@ msgstr "" "перевірки\n" " вузла\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2289,7 +2262,7 @@ msgstr "" " --random-file=ФÐЙЛ файл з пÑевдовипадковими даними Ð´Ð»Ñ " "Ñ–Ð½Ñ–Ñ†Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ PRNG SSL\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2297,15 +2270,15 @@ msgstr "" " --egd-file=ФÐЙЛ назва файла Ñокета EGD з " "пÑевдовипадковими даними\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Параметри HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts вимкнути HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2313,11 +2286,11 @@ msgstr "" " --hsts-file шлÑÑ… до бази даних HSTS (перевизначає " "типовий)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Параметри FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2325,36 +2298,36 @@ msgstr "" " --ftp-stmlf викориÑтовувати формат Stream_LF Ð´Ð»Ñ Ð²ÑÑ–Ñ… " "бінарних файлів FTP\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=ІМ'Я вÑтановити ІМ'Я кориÑтувача Ð´Ð»Ñ ftp.\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=ПÐРОЛЬ вÑтановити ПÐРОЛЬ кориÑтувача Ð´Ð»Ñ ftp\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing не вилучати файли .listing\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob вимкнути універÑалізацію назв файлів FTP\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp вимкнути \"паÑивний\" тип передаваннÑ\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions зберігати права доÑтупу до файла\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2363,11 +2336,11 @@ msgstr "" "Ñимволічними\n" " поÑиланнÑми файли (не каталоги)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Параметри FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2375,7 +2348,7 @@ msgstr "" " --ftps-implicit викориÑтовувати неÑвний FTPS (типовий " "порт -- 990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2386,7 +2359,7 @@ msgstr "" " Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ " "даними\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2394,7 +2367,7 @@ msgstr "" " --ftps-clear-data-connection шифрувати лише канал керуваннÑ; уÑÑ– " "дані передаватимутьÑÑ Ñƒ режимі проÑтого текÑту\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2402,11 +2375,11 @@ msgstr "" " --ftps-fallback-to-ftp викориÑтовувати FTP, Ñкщо на Ñервері " "не передбачено підтримки FTPS\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Параметри, пов'Ñзані з WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2414,23 +2387,23 @@ msgstr "" " --warc-file=ÐÐЗВÐ_ФÐЙЛРзберегти дані запиту Ñ– відповіді до " "файла .warc.gz\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=РЯДОК вÑтавити РЯДОК до запиÑу warcinfo\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=ЧИСЛО вÑтановити макÑимальний розмір файлів " "WARC у Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð§Ð˜Ð¡Ð›Ðž\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx запиÑувати файли покажчика CDX\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2438,18 +2411,18 @@ msgstr "" " --warc-dedup=ÐÐЗВÐ_ФÐЙЛРне зберігати запиÑи зі ÑпиÑку, " "визначеному у цьому файлі CDX\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression не ÑтиÑкати файли WARC за допомогою GZIP\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" " --no-warc-digests не обчиÑлювати контрольні Ñуми SHA1\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2457,7 +2430,7 @@ msgstr "" " --no-warc-keep-log не зберігати назви файла журналу у запиÑÑ– " "WARC\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2467,17 +2440,17 @@ msgstr "" "Ñтворених\n" " заÑобом запиÑу WARC\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "РекурÑивне завантаженнÑ:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" " -r, --recursive вÑтановити рекурÑивний режим " "завантаженнÑ\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2485,13 +2458,13 @@ msgstr "" " -l, --level=ЧИСЛО макÑимальна глибина рекурÑÑ–Ñ— (0 - без " "обмеженнÑ).\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after локально вилучити отримані файли.\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2502,7 +2475,7 @@ msgstr "" " так, щоб вони вказували на локальні " "файли\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2510,7 +2483,7 @@ msgstr "" " --convert-file-only перетворювати лише чаÑтину адреÑи, Ñка " "ÑтоÑуєтьÑÑ Ñ„Ð°Ð¹Ð»Ð° (зазвичай, Ñ—Ñ— називають «базовою назвою»)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2518,7 +2491,7 @@ msgstr "" " --backups=N до запиÑÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X, поÑлідовно " "Ñтворити N файлів резервних копій\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2526,7 +2499,7 @@ msgstr "" " -K, --backup-converted до Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X Ñтворити резервну " "копію X_orig\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2534,7 +2507,7 @@ msgstr "" " -K, --backup-converted до Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° X Ñтворити резервну " "копію X.orig\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2542,7 +2515,7 @@ msgstr "" " -m, --mirror Ñкорочена форма Ð´Ð»Ñ Ð½Ð°Ð±Ð¾Ñ€Ñƒ -N -r -l inf --" "no-remove-listing\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2550,7 +2523,7 @@ msgstr "" " -p, --page-requisites отримати вÑÑ– зображеннÑ, Ñ– Ñ‚.п. Ð´Ð»Ñ " "показу HTML\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2558,59 +2531,59 @@ msgstr "" " --strict-comments увімкнути жорÑтку (SGML) обробку " "коментарів HTML\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "РекурÑивне включеннÑ/Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=СПИСОК ÑпиÑок розширень на включеннÑ\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=СПИСОК ÑпиÑок розширень на виключеннÑ\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=ВИРÐЗ формальний вираз прийнÑтних адреÑ\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=ВИРÐЗ формальний вираз відкинутих адреÑ\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=ТИП тип формального виразу (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=ТИП тип формального виразу (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=СПИСОК ÑпиÑок дозволених доменів\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=СПИСОК ÑпиÑок виключених доменів відокремлених " "комами\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp переходити за поÑиланнÑми на реÑурÑи FTP " "з документів HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" @@ -2618,7 +2591,7 @@ msgstr "" " --follow-tags=СПИСОК розділений комами ÑпиÑок теґів HTML, за " "Ñким Ñлід здійÑнювати перехід\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" @@ -2626,24 +2599,24 @@ msgstr "" " --ignore-tags=СПИСОК розділений комами ÑпиÑок теґів HTML, Ñкі " "Ñлід ігнорувати\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" " -H, --span-hosts переходити до інших вузлів під Ñ‡Ð°Ñ " "рекурÑивної обробки\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" " -L, --relative переходити лише за відноÑними " "поÑиланнÑми\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" " -I, --include-directories=LIST вказати ÑпиÑок дозволених каталогів\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2652,88 +2625,88 @@ msgstr "" " --trust-server-names викориÑтовувати назву, вказану адреÑою\n" " переÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñтаннього компонента\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" " -X, --exclude-directories=LIST вказати ÑпиÑок виключених каталогів\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" " -np, --no-parent не підніматиÑÑ Ð´Ð¾ батьківÑького каталогу\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилки та пропозиції надÑилайте до \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, Ðвтоматичний завантажувач файлів з мережі.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Пароль Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача %s:" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Пароль:" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Ðе вдалоÑÑ Ñтворити канал\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Помилка під Ñ‡Ð°Ñ Ñпроби ініціалізувати дії з Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ use-" "askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" "Помилка під Ñ‡Ð°Ñ Ñпроби вÑтановити дії з Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ use-askpass: " "%d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ– від команди «%s %s»: %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача «%s%s»: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Пароль до «%s%s@%s»: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Локаль: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Збірка: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "ПоÑиланнÑ: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2742,29 +2715,29 @@ msgstr "" "GNU Wget %s, зібрано %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (Ñередовище)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (кориÑтувач)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (ÑиÑтема)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "© Free Software Foundation, Inc., %s\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2780,7 +2753,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2788,39 +2761,39 @@ msgstr "" "\n" "Ðвтор: Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилки та пропозиції надÑилайте до .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Проблема з розподілом пам’ÑÑ‚Ñ–\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Завершуємо роботу через помилку у %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Спробуйте `%s --help' Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¾Ñ— інформації.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: невірний параметр -- `-n%c'\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" "Підтримку діагноÑтики не реалізовано під Ñ‡Ð°Ñ Ð·Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ. Ігноруємо прапорець --" "debug.\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2829,7 +2802,7 @@ msgstr "" "ОдночаÑно вказано --no-clobber Ñ– --convert-links, буде викориÑтано лише --" "convert-links.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2838,22 +2811,22 @@ msgstr "" "ОдночаÑно вказано --no-clobber Ñ– -convert-file-only, буде викориÑтано лише -" "convert-file-only.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Режими verbose та quiet не можна викориÑтовувати одночаÑно.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "Режими підтримки міток чаÑу та Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñтарих файлів неÑуміÑні.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "Ðе можливо вказати одночаÑно --inet4-only та --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2866,7 +2839,7 @@ msgstr "" "(man).\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2876,7 +2849,7 @@ msgstr "" "буде розташовано у вказаному вами єдиному файлі.\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2886,19 +2859,14 @@ msgstr "" "відомоÑÑ‚Ñ– можна знайти на Ñторінці підручника (man).\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Файл `%s' вже Ñ”, не завантажуємо.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з --no-clobber, --no-clobber буде вимкнено.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2906,12 +2874,12 @@ msgstr "" "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з викориÑтаннÑм чаÑових позначок, чаÑові " "позначки буде вимкнено.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2920,7 +2888,7 @@ msgstr "" "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --continue або --start-pos. Їх буде " "вимкнено.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" @@ -2928,7 +2896,7 @@ msgstr "" "Контрольні Ñуми вимкнено; заÑоби ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ WARC не зможуть знайти " "запиÑи-дублікати.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2937,13 +2905,13 @@ msgstr "" "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð¾ WARC не працює з параметром --continue або --start-pos. Їх буде " "вимкнено.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Ðе можна одночаÑно викориÑтовувати параметри --ask-password Ñ– --password.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2952,18 +2920,18 @@ msgstr "" "Ðе рекомендуємо викориÑтовувати одночаÑно --start-pos Ñ– --continue; --" "continue буде вимкнено.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: не вказано URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Ðе можна одночаÑно викориÑтовувати параметри --post-data Ñ– --post-file.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2973,7 +2941,7 @@ msgstr "" "--method потрібні дані, передані за допомогою параметрів --body-data Ñ– --" "body-file.\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2982,17 +2950,17 @@ msgstr "" "Вам Ñлід вказати метод за допомогою параметра --method=МетодHTTP, щоб " "ÑкориÑтатиÑÑ --body-data або --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "Ðе можна одночаÑно визначати --body-data Ñ– --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Поточна верÑÑ–Ñ Ð½Ðµ має підтримки IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -3000,7 +2968,7 @@ msgstr "" "-k або -r можна викориÑтовувати разом з -O, лише Ñкщо дані запиÑуютьÑÑ Ð´Ð¾ " "звичайного файла.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -3009,42 +2977,42 @@ msgstr "" "--convert-links Ñ– --convert-file-only можна викориÑтовувати разом, лише Ñкщо " "дані запиÑуютьÑÑ Ð´Ð¾ звичайного файла.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ канал c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ IP-адреÑу «%s»\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити Ñервери DNS «%s» (%d)\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Ð’ %s не знайдено поÑилань.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ файл метапоÑилань %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ уÑÑ– реÑурÑи з %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -3055,7 +3023,7 @@ msgstr "" "Загальний чаÑ: %s\n" "Завантажено: %d файлів, %s за %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "ВИЧЕРПÐÐО Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ (%s)!\n" @@ -3214,112 +3182,112 @@ msgstr "Файл %s отримано, але його Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð½Ðµ збіг msgid "Renaming %s to %s.\n" msgstr "Перейменовуємо %s на %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Продовжуємо у фоновому режимі.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Продовжуємо у фоновому режимі, номер процеÑу %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Ð’Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ запиÑано до %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "помилка fake_fork_child()\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "помилка fake_fork()\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ потрібний драйвер.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "Помилка ioctl(). Ðе вдалоÑÑ Ð²Ñтановити Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° Ñокетом.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: попередженнÑ: лекÑема %s перед назвою машини\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: невідома лекÑема \"%s\"\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "ВикориÑтаннÑ: %s NETRC [ÐÐЗВРВУЗЛÐ]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" "ПОПЕРЕДЖЕÐÐЯ: викориÑтовуєтьÑÑ Ñлабкий заÑіб ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñевдовипадкових " "чиÑел.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "Ðе вдалоÑÑ Ñтворити початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ PRNG. Вам варто ÑкориÑтатиÑÑ --random-" "file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" "Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.1 у ній не " "реалізовано\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" "Ваша верÑÑ–Ñ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÐ¸ OpenSSL Ñ” надто Ñтарою, підтримку TLSv1.2 у ній не " "реалізовано\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: не реалізоване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «secure-protocol», %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ Ñертифікат %s, випущений %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Ðеможливо локально перевірити чинніÑÑ‚ÑŒ запиÑу видавцÑ.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " ВиÑвлено ÑамопідпиÑаний Ñертифікат.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Виданий Ñертифікат ще не дійÑний.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Виданий Ñертифікат проÑтрочений.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3328,7 +3296,7 @@ msgstr "" "%s: жоден з варіантів Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñертифіката не\n" "\tвідповідає потрібній назві вузла, %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3336,7 +3304,7 @@ msgstr "" " %s: загальна назва об’єкта Ñертифікації, %s, не відповідає потрібній " "назві вузла %s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3347,14 +3315,14 @@ msgstr "" " Це може означати, що автентичніÑÑ‚ÑŒ вузла викликає Ñумніви\n" " (тобто це наÑправді не %s).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" "Ð”Ð»Ñ Ð·â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· %s без захиÑту, ÑкориÑтайтеÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ «--no-check-" "certificate».\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3363,28 +3331,28 @@ msgstr "" "\n" "%*s[ пропуÑк %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Ðекоректне Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ñтилю %s; лишаємо без зміни.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " Ñ‡Ð°Ñ %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " за " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð°Ð¹Ð¼ÐµÑ€Ñƒ реального чаÑy: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ %s, оÑкільки його треба пропуÑтити.\n" @@ -3398,22 +3366,22 @@ msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Завантажуємо файл robots.txt; не зважайте на помилки.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Помилка розбору адреÑи прокÑÑ– %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Помилка в адреÑÑ– прокÑÑ–-Ñервера %s: має бути HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "%d зациклень - більше, ніж допуÑтимо.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3421,7 +3389,7 @@ msgstr "" "Ðварійне завершеннÑ.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3429,126 +3397,126 @@ msgstr "" "ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ñпроб.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Без помилок" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Схема %s не підтримуєтьÑÑ" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Схема відÑутнÑ" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Ðекоректна назва вузла" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Ðевірний номер порту" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Ðекоректне ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Ðезакінчена чиÑлова IPv6 адреÑа" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "IPv6 не підтримуєтьÑÑ" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Ðекоректна чиÑлова IPv6 адреÑа" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "Підтримку HTTPS не Ñкомпільовано" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "ВиÑвлено неповну або некоректну багатобайтову поÑлідовніÑÑ‚ÑŒ\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Ðе вдалоÑÑ Ð²Ð¸Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ доÑтатньо пам'ÑÑ‚Ñ–; недоÑтатньо пам'ÑÑ‚Ñ–.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Ðе вдалоÑÑ Ð²Ð¸Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ %ld байт; недоÑтатньо пам'ÑÑ‚Ñ–.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" "%s: aprintf: текÑтовий буфер завеликий (%d байт), перериваємо обробку.\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Продовжуємо у фоновому режимі, номер процеÑу %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Ðе вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ IP-адреÑу «%s»\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Ðе вдалоÑÑ Ð²Ñтановити права доÑтупу Ð´Ð»Ñ %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Ðекоректний формальний вираз %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ– %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3642,6 +3610,26 @@ msgstr "" "У файлі CDX виÑвлено точний відповідник. Зберігаємо Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾Ð³Ð¾ " "Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '--%s' не передбачено\n" + +# --option +# --option +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: нерозпізнаний параметр '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: неоднозначний параметр '-W %s'\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра '-W %s' не передбачено\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: до параметра '-W %s' Ñлід додати аргумент\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Файл `%s' вже Ñ”, не завантажуємо.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/vi.gmo b/po/vi.gmo index 463259e..d942fc1 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index 8be7537..5203eac 100644 --- a/po/vi.po +++ b/po/vi.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2017-01-24 08:49+0700\n" "Last-Translator: Trần Ngá»c Quân \n" "Language-Team: Vietnamese \n" @@ -25,7 +25,7 @@ msgstr "" "X-Generator: Gtranslator 2.91.7\n" "X-Poedit-SourceCharset: UTF-8\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Lá»—i hệ thống không rõ" @@ -33,7 +33,7 @@ msgstr "Lá»—i hệ thống không rõ" msgid "Address family for hostname not supported" msgstr "HỠđịa chỉ cho tên máy không được há»— trợ" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "Thất bại tạm thá»i khi phân giải tên" @@ -101,70 +101,45 @@ msgstr "Bị ngắt bởi má»™t tín hiệu" msgid "Parameter string not correctly encoded" msgstr "Chuá»—i tham số không được mã hóa má»™t cách đúng đắn" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "Lá»—i không rõ nguyên nhân" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tùy chá»n “%s†chÆ°a rõ ràng; khả năng là:" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: tùy chá»n “%s†chÆ°a rõ ràng\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: tùy chá»n “%s†chÆ°a rõ ràng; khả năng là:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: không nhận ra tùy chá»n “%c%sâ€\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: tùy chá»n “%c%s†không cho phép đối số\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: tùy chá»n “--%s†cần má»™t đối số\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: không nhận ra tùy chá»n “--%sâ€\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: không nhận ra tùy chá»n “%c%sâ€\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: tùy chá»n sai -- “%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- “%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ ràng\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tùy chá»n “-W %s†cần má»™t đối số\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -184,13 +159,13 @@ msgstr "%s: tùy chá»n “-W %s†cần má»™t đối số\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -262,28 +237,28 @@ msgstr "Biểu thức chính quy quá lá»›n" msgid "Unmatched ) or \\)" msgstr "ChÆ°a khá»›p “)†hoặc “\\)â€" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "Không có biểu thức chính quy nằm trÆ°á»›c" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "không thể tạo ống dẫn" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "tiến trình con %s gặp lá»—i" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle gặp lá»—i" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "không thể phục hồi bá»™ mô tả tập tin %d: dup2 gặp lá»—i" @@ -302,51 +277,51 @@ msgstr "tiến trình con %s đã nhận tín hiệu báo lá»—i nghiêm trá»ng msgid "memory exhausted" msgstr "hết bá»™ nhá»›" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: không tìm thấy được địa chỉ bind “%sâ€; tắt bá» bind.\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "Kết nối tá»›i %s[%s]:%d… " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "Kết nối tá»›i %s:%d… " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "Kết nối tá»›i [%s]:%d… " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF gặp lá»—i: %s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "đã kết nối.\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "gặp lá»—i: %s.\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: không phân giải được địa chỉ của máy %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR gặp lá»—i: %s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "Mở quá nhiá»u fd. Không thể dùng chá»n trên má»™t fd >= %d\n" @@ -380,174 +355,174 @@ msgstr "Không xóa được %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "Không sao lÆ°u được %s thành %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "Không thể lấy cookie cho %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Lá»—i cú pháp trong Set-Cookie: %s tại vị trí %d.\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "Cookie đến từ %s đã cố đặt miá»n thành" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "Không mở được tập tin cookie %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "Lá»—i ghi vào %s: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "Lá»—i đóng %s: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "Dạng danh sách không há»— trợ, Ä‘ang thá»­ phân tích dạng danh sách Unix.\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "Chỉ mục của /%s trên %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "thá»i gian không xác định " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "Tập tin " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "ThÆ° mục " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "Liên kết " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "Không chắc " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s byte)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "Kích thÆ°á»›c: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr ", còn lại %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr ", còn %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (không đủ thẩm quyá»n)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "Không thể khởi tạo SSL. Nó sẽ bị tắt Ä‘i." -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "Äăng nhập vá»›i tên %s… " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "Lá»—i trong câu trả lá»i của máy phục vụ, đóng liên kết Ä‘iá»u khiển.\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "Lá»—i trong lá»i chào của máy phục vụ.\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "Gặp lá»—i khi ghi, đóng liên kết Ä‘iá»u khiển.\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "Máy phục vụ từ chối đăng nhập.\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "Äăng nhập không đúng.\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "Äã đăng nhập!\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "Máy chủ không chấp nhận lệnh “PBSZ 0â€.\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "Máy chủ không chấp nhận lệnh “PROT %câ€.\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "Lá»—i máy phục vụ, không xác định được dạng hệ thống.\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "xong. " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "xong.\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "Không hiểu kiểu “%câ€, đóng kết nối Ä‘iá»u khiển.\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "xong. " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> không cần CWD.\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "Theo lô-gíc không thể vá»›i đến các phần trong getftp()" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -558,7 +533,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -567,37 +542,37 @@ msgstr "" "Không có thÆ° mục %s.\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> không yêu cầu CWD.\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "Tập tin đã được lấy rồi.\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "Không khởi đầu được sá»± truyá»n tải PASV.\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "Không phân tích được câu trả lá»i PASV.\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "không kết nối được tá»›i %s cổng %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Lá»—i buá»™c “bind†(%s).\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "Lệnh PORT không đúng.\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,17 +580,17 @@ msgstr "" "\n" "REST không thành công; làm lại từ đầu.\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "Tập tin %s đã sẵn có.\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "Không có tập tin %s.\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -624,7 +599,7 @@ msgstr "" "Không có tập tin %s.\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -633,40 +608,40 @@ msgstr "" "Không có tập tin hay thÆ° mục tên %s.\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s xuất hiện bất thình lình.\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s, đóng kết nối Ä‘iá»u khiển.\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - Kết nối dữ liệu: %s; " -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "Äã đóng kết nối Ä‘iá»u khiển.\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "Truyá»n tải dữ liệu bị bãi bá».\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "Tập tin %s đã có ở đó nên không nhận nữa.\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(lần thá»­: %2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -675,7 +650,7 @@ msgstr "" "%s (%s) — ghi vào đầu ra tiêu chuẩn %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -684,34 +659,34 @@ msgstr "" "%s (%s) — đã lÆ°u %s [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "Äang xóa %s.\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "Dùng %s làm tập tin danh sách tạm.\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "Äã xóa %s.\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "Äá»™ sâu đệ quy %d vượt quá ngưỡng tối Ä‘a %d.\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" "Tập tin trên máy chủ không má»›i hÆ¡n tập tin cục bá»™ %s -- không tải xuống.\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" @@ -720,7 +695,7 @@ msgstr "" "Tập tin %s trên máy chủ má»›i hÆ¡n tập tin cục bá»™ -- Ä‘ang tải xuống.\n" "\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -729,11 +704,11 @@ msgstr "" "Kích thÆ°á»›c không bằng nhau (ná»™i bá»™ %s) -- Ä‘ang tải xuống.\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "Tên của liên kết má»m không hợp lệ, bá» qua.\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -742,238 +717,238 @@ msgstr "" "Äã có liên kết má»m đúng %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "Tạo liên kết má»m %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "Không há»— trợ liên kết má»m, bá» qua liên kết má»m %s.\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "Bá» qua thÆ° mục %s.\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: Kiểu tập tin không biết hoặc không được há»— trợ.\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "Gặp lá»—i khi phân quyá»n cho %s.\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: dấu vết thá»i gian bị há»ng.\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "Sẽ không nhận thÆ° mục vì Ä‘á»™ sâu là %d (tối Ä‘a %d).\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "Không vào %s vì nó bị loại ra hoặc không được thêm vào.\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "Từ chối %s.\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "Lá»—i khá»›p %s vá»›i %s: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "Không tìm thấy cái nào khá»›p vá»›i mẫu %s.\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "Äã viết chỉ mục ở dạng HTML vào %s [%s].\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "Äã viết chỉ mục ở dạng HTML vào %s.\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "Lá»–I: Không thể mở thÆ° mục %s.\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "Lá»–I: Gặp lá»—i khi mở giấy chứng nhận %s: (%d).\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "Chứng nhận CA đã tải “%sâ€\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "Lá»–I: Gặp lá»—i khi tải tập tin CRL “%sâ€: (%d).\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "Tập tin CRL đã tải “%sâ€\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "Lá»–I: GnuTLS yêu cầu khóa và chứng nhận phải cùng má»™t kiểu.\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS: giá trị tùy chá»n “secure-protocol†chÆ°a được thá»±c hiện %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "Hãy gá»­i thông báo lá»—i nảy sinh này cho .\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS: giá trị tùy chá»n “secure-protocol†chÆ°a được thá»±c hiện %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "Lá»–I" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "CẢNH BÃO" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: Không có chứng thá»±c từ %s.\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: Chứng nhận của %s không tin cậy.\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: Chứng nhận của %s không có nhà cấp đã biết.\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: Chứng nhận của %s đã bị thu hồi.\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: NgÆ°á»i ký chứng nhận của %s không phải là má»™t CA.\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: Chứng nhận của %s đã được ký bằng thuật toán không an toàn.\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: Chứng nhận của %s vẫn chÆ°a được kích hoạt.\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: Chứng nhận của %s đã bị hết hạn.\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "Lá»—i khởi tạo chứng nhận X509: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "Không tìm thấy chứng nhận nào\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "Lá»—i phân tích cú pháp của chứng nhận: %s\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "Chứng nhận vẫn chÆ°a được kích hoạt\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "Chứng nhận đã hết hạn dùng\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "Chủ chứng nhận không tÆ°Æ¡ng ứng vá»›i tên máy %s\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "Khóa công không khá»›p vá»›i khóa công được đóng cứng!\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "Giấy chứng nhận phải có định dạng X.509\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "Có lá»—i trong xá»­ lý danh sách địa chỉ.\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "Máy lạ" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "Äang phân giải %s… " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "gặp lá»—i: Không có địa chỉ IPv4/IPv6 cho máy.\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "gặp lá»—i: quá lâu không đáp ứng.\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: Không thể phân giải liên kết không hoàn chỉnh %s.\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL không hợp lệ %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "Lá»—i ghi yêu cầu HTTP: %s.\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "Không có phần đầu, coi là HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -982,11 +957,11 @@ msgstr "" "Tập tin %s đã sẵn có nên không nhận nữa.\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime gặp lá»—i. Äây gần nhÆ° chắc chắn là má»™t lá»—i.\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" @@ -994,55 +969,55 @@ msgstr "" "Không thể chuyển đổi dấu vết thá»i gian sang định dạng http. Quay lại dùng 0 " "làm thá»i Ä‘iểm sá»­a lần cuối.\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "Thiếu tập tin dữ liệu BODY %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "Dùng lại kết nối đã có tá»›i [%s]:%d.\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "Dùng lại kết nối đã có tá»›i %s:%d.\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "Gặp lá»—i khi Ä‘á»c trả lá»i từ ủy nhiệm: %s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s Lá»–I %d: %s.\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "Dòng trạng thái sai dạng" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "Gặp lá»—i khi tạo Ä‘Æ°á»ng hầm ủy nhiệm: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "Không hiểu lược đồ xác thá»±c.\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "Xác thá»±c đã chá»n: %s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "Äang ghi vào: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1051,20 +1026,20 @@ msgstr "" "Khi Ä‘ang tải chữ ký:\n" "%s: %s.\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "Không thể Ä‘á»c ná»™i dung chữ ký từ tập tin tạm. Nên bá» qua.\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "Không thể tạo tập tin tạm. Äang bá» qua việc tải chữ ký vá».\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "Giá trị pri không hợp lệ. Nên coi là %d.\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1072,49 +1047,49 @@ msgstr "" "Không thể tìm thấy tóm lược được chấp thuận cho nguồn Metalink.\n" "Nên bá» qua chúng.\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "Tắt SSL vì gặp lá»—i.\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "Äã gá»­i yêu cầu %s, Ä‘ang đợi câu trả lá»i… " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "Không nhận được dữ liệu.\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "Lá»—i Ä‘á»c (%s) trong phần đầu.\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(không mô tả)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "Äịa Ä‘iểm: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "không xác định" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [theo]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "Tập tin %s chÆ°a bị sá»­a trên máy chủ. Nên bá» qua không tải vá».\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1125,7 +1100,7 @@ msgstr "" "Bạn có lẽ nên thêm tùy chá»n --no-if-modified-since.\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1135,58 +1110,58 @@ msgstr "" " Äã nhận tập tin đầy đủ; không cần làm gì nữa.\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "Kích thÆ°á»›c: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "bá» qua" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "Cảnh báo: không há»— trợ ký tá»± đại diện trong HTTP.\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "Äã bật chế Ä‘á»™ nhện. Hãy kiểm tra tập tin trên máy chủ tồn tại không.\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "Không thể ghi vào %s (%s).\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "Thiếu thuá»™c tính cần thiết từ Phần đầu nhận được.\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "PhÆ°Æ¡ng thức xác thá»±c Tài-khoản/Mật_khẩu bị lá»—i.\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "Không thể ghi vào tập tin WARC.\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "Không thể ghi vào tập tin tạm thá»i WARC.\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "Không thiết lập được kết nối SSL.\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "Không thể hủy liên kết %s (%s).\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "Lá»–I: Chuyển hÆ°á»›ng (%d) mà không có vị trí.\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" @@ -1194,23 +1169,23 @@ msgstr "" "Không thể tìm thấy dữ liệu Metalink trong phần HTTP trả vá». Äang tải các tập " "tin dùng HTTP GET.\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "Tìm thấy phần đầu Metalink. Nên chuyển sang chế Ä‘á»™ Metalink.\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "Tập tin trên máy chủ không tồn tại -- liên kết há»ng!!!\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "Thiếu phần đầu “Last-modified†-- time-stamp bị tắt.\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "Sai phần đầu “Last-modified†-- time-stamp bị bá» qua.\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1219,16 +1194,16 @@ msgstr "" "Tập tin %s trên máy chủ không má»›i hÆ¡n tập tin cục bá»™ -- không nhận.\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "Kích thÆ°á»›c tập tin không tÆ°Æ¡ng ứng (cục bá»™ %s) - Ä‘ang nhận.\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "Tập tin trên máy chủ má»›i hÆ¡n, Ä‘ang nhận.\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1238,7 +1213,7 @@ msgstr "" "Ä‘ang lấy vá».\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1246,7 +1221,7 @@ msgstr "" "Tập tin trên máy chủ tồn tại nhÆ°ng không chứa liên kết -- không lấy vá».\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1256,7 +1231,7 @@ msgstr "" "nhÆ°ng đệ quy bị tắt -- không lấy vá».\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1264,12 +1239,12 @@ msgstr "" "Tập tin trên máy chủ đã sẵn có.\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1278,7 +1253,7 @@ msgstr "" "%s (%s) — ghi vào đầu ra chuẩn %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1287,58 +1262,58 @@ msgstr "" "%s (%s) — đã lÆ°u %s [%s/%s]\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - Äóng kết nối tại byte %s. " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - Lá»—i Ä‘á»c tại byte %s (%s)." -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - Lá»—i Ä‘á»c tại byte %s/%s (%s). " -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "Không há»— trợ chất lượng bảo vệ “%sâ€.\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "Không há»— trợ thuật toán “%sâ€.\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC chỉ tá»›i %s, mà nó lại không tồn tại.\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: Không Ä‘á»c được %s (%s).\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%s: Lá»—i trong %s trên dòng %d.\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%s: Lá»—i cú pháp trong %s trên dòng %d.\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%s: Lệnh không biết %s trong %s trên dòng %d.\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1349,7 +1324,7 @@ msgstr "" "Xin hãy kiểm tra “%sâ€,\n" "hay chỉ định má»™t tập tin khác sá»­ dụng tùy chá»n --config.\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1360,49 +1335,49 @@ msgstr "" "“%sâ€,\n" "hay chỉ định má»™t tập tin khác sá»­ dụng tùy chá»n --config.\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: Cảnh báo: Cả wgetrc của hệ thống và ngÆ°á»i dùng Ä‘á»u chỉ tá»›i %s.\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: Câu lệnh “--execute†không đúng %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: Giá trị %s không đúng; dùng “on†(bật) hay “off†(tắt)\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" "%s: %s: %s không hợp lệ; dùng “on†(bật), “off†(tắt) hay “quiet†(im " "lặng).\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: Số %s sai.\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s chỉ được dùng má»™t lần\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: Giá trị byte %s sai.\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: Khoảng thá»i gian %s sai.\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " @@ -1411,28 +1386,28 @@ msgstr "" "use-askpass yêu cầu má»™t chuá»—i hoặc là má»™t biến môi trÆ°á»ng WGET_ASKPASS hoặc " "là SSH_ASKPASS được đặt.\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: Giá trị %s sai.\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: Phần đầu %s sai.\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: Phần đầu WARC không hợp lệ %s.\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: Sai kiểu tiến Ä‘á»™ %s.\n" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1441,40 +1416,40 @@ msgstr "" "%s: %s: Sai giá»›i hạn %s,\n" " dùng: [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "Bảng mã %s không hợp lệ\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "Không há»— trợ chức năng chuyển đổi từ %s sang %s\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "Gặp chuá»—i byte không hoàn chỉnh hoặc không hợp lệ\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "Mã lá»—i %d không được xá»­ lý\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: chÆ°a đặt miá»n địa phÆ°Æ¡ng\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode bị lá»—i (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "Gặp lá»—i khi chuyển sang chữ thÆ°á»ng: %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1483,17 +1458,17 @@ msgstr "" "\n" "Chuyển hÆ°á»›ng kết xuất tá»›i %s.\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s; không ghi nhật ký.\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "Cách dùng: %s [TÙY CHỌN]… [URL]…\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1501,74 +1476,74 @@ msgstr "" "Tùy chá»n dài bắt buá»™c phải có tham số Ä‘i kèm thì tùy chá»n ngắn cÅ©ng vậy.\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "Khởi Ä‘á»™ng:\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" " -V, --version hiển thị phiên bản của Wget rồi thoát.\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help hiển thị trợ giúp này.\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" " -b, --background chuyển chạy ná»n sau sau khi khởi Ä‘á»™ng.\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" " -e, --execute=LỆNH thá»±c hiện má»™t câu lệnh kiểu-“.wgetrcâ€.\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "Tập tin nhật ký và đầu vào:\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=TẬP-TIN ghi nhật ký vào TẬP-TIN.\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" " -a, --append-output=TẬP-TIN nối thêm các lá»i nhắn vào TẬP-TIN.\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" " -d, --debug hiển thị nhiá»u thông tin để tìm và sá»­a " "lá»—i.\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" " --wdebug hiển thị kết xuất để gỡ lá»—i bằng " "Watt-32.\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" " -q, --quiet im lặng (không kết xuất ra màn hình).\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" " -v, --verbose hiển thị chi tiết (đây là mặc định).\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" " -nv, --no-verbose không chi tiết, cÅ©ng không im lặng.\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" @@ -1577,7 +1552,7 @@ msgstr "" "KIỂU.\n" " KIỂU có thể là các bít.\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" @@ -1585,7 +1560,7 @@ msgstr "" " -i, --input-file=TẬP-TIN tải các URL trong TẬP-TIN cục bá»™ hay bên " "ngoài.\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" @@ -1593,11 +1568,11 @@ msgstr "" " --input-metalink=TẬP-TIN tải các URL tìm thấy trong TẬP-TIN " "Metalink cục bá»™.\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html coi tập tin đầu vào là HTML.\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1606,44 +1581,44 @@ msgstr "" "-F)\n" " tÆ°Æ¡ng đối so vá»›i URL này\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" " --config=TẬP-TIN chỉ định tập tin cấu hình sẽ sá»­ dụng\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" " --no-config đừng Ä‘á»c bất kỳ tập tin cấu hình nào\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" " --rejected-log=TẬP-TIN ghi nhật ký các lý do URL bị từ chối vào " "TẬP-TIN\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "Tải vá»:\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=SỠđặt số lần thá»­ lại (0 = không giá»›i hạn).\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused cố tải dù kết nối bị từ chối.\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=TẬP-TIN ghi dữ liệu vào TẬP-TIN này.\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" @@ -1652,7 +1627,7 @@ msgstr "" "tin\n" " đã có (ghi đè lên chúng).\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." @@ -1660,7 +1635,7 @@ msgid "" msgstr "" " --no-config đừng Ä‘á»c bất kỳ tập tin cấu hình nào\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" @@ -1668,7 +1643,7 @@ msgstr "" " -c, --continue tiếp tục tải phần còn tại của má»™t tập " "tin.\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" @@ -1676,17 +1651,17 @@ msgstr "" " --start-pos=OFFSET bắt đầu tải vá» từ vị trí bù này tính từ " "mốc không\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=KIỂU chá»n dạng mô tả tiến Ä‘á»™.\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=KIỂU chá»n dạng mô tả tiến Ä‘á»™.\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" @@ -1695,7 +1670,7 @@ msgstr "" " -N, --timestamping không nhận lại tập tin trừ khi má»›i hÆ¡n\n" " ná»™i bá»™.\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1704,7 +1679,7 @@ msgstr "" " --no-if-modified-since đừng dùng Ä‘iá»u kiện if-modified-since\n" " trong chế Ä‘á»™ dấu vết thá»i gian\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" @@ -1714,20 +1689,20 @@ msgstr "" " tùy theo nhãn thá»i gian trên máy phục " "vụ.\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response in ra đáp ứng của máy chủ.\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider không tải xuống gì hết.\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" " -T, --timeout=GIÂY đặt má»i giá trị thá»i hạn là số GIÂY.\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" @@ -1735,7 +1710,7 @@ msgstr "" " --dns-servers=ÄỊA_CHỈ liệt kê các máy phục vụ DNS muốn truy vấn " "(ngăn cách bằng dấu phẩy)\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1743,32 +1718,32 @@ msgstr "" " --bind-dns-address=ÄỊA-CHỈ buá»™c vào ÄỊA_CHỈ này (tên máy hoặc IP)\n" " trên máy ná»™i bá»™.\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" " --dns-timeout=GIÂY đặt thá»i gian chá» tìm DNS thành GIÂY.\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" " --connect-timeout=GIÂY đặt thá»i gian chá» kết nối thành GIÂY.\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=GIÂY đặt thá»i gian chá» Ä‘á»c thành GIÂY.\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" " -w, --wait=GIÂY chá» số GIÂY này giữa các lần phục hồi.\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr " --waitretry=GIÂY chá» 1..GIÂY giữa các lần thá»­ lấy.\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1776,16 +1751,16 @@ msgstr "" " --random-wait chá» 0.5*WAIT…1.5*WAIT giây giữa hai lần " "lấy.\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy không dùng máy chủ ủy nhiệm.\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" " -Q, --quota=SỠđặt giá»›i hạn số phục hồi thành Sá» này.\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1793,18 +1768,18 @@ msgstr "" " --bind-address=ÄỊA-CHỈ buá»™c vào ÄỊA_CHỈ này (tên máy hoặc IP)\n" " trên máy ná»™i bá»™.\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" " --limit-rate=Tá»C-ÄỘ giá»›i hạn tốc Ä‘á»™ tải xuống thành Tá»C_ÄỘ " "này.\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" " --no-dns-cache không dùng bá»™ nhá»› đệm tìm kiếm DNS.\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" @@ -1812,7 +1787,7 @@ msgstr "" " --restrict-file-names=OS giá»›i hạn ký tá»± trong tên tập tin thành\n" " những gì hệ Ä‘iá»u hành cho phép.\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" @@ -1821,15 +1796,15 @@ msgstr "" "mẫu\n" " tin/thÆ° mục.\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only chỉ kết nối tá»›i các địa chỉ IPv4.\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only chỉ kết nối tá»›i các địa chỉ IPv6.\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1840,23 +1815,23 @@ msgstr "" " má»™t trong IPv6, IPv4, hoặc none " "(không).\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=TÀI-KHOẢN đặt ngÆ°á»i dùng cho cả ftp và http.\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=MẬT-KHẨU đặt cả mật khẩu ftp và http thành MẬT-" "KHẨU.\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password nhắc nhập mật khẩu.\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1874,29 +1849,29 @@ msgstr "" "SSH_ASKPASS \n" " sẽ được dùng.\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri tắt há»— trợ IRI.\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=BẢNG-Mà dùng bảng mã này làm bảng mã cục bá»™ cho " "IRI.\n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" " --remote-encoding=BẢNG-Mà dùng bảng mã này làm bảng mã từ xa mặc " "định.\n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink gỡ bá» tập tin trÆ°á»›c khi ghi đè.\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" @@ -1904,7 +1879,7 @@ msgstr "" " --keep-badhash giữ lại các tập tin mà không khá»›p tổng " "kiểm (treo thêm .badhash)\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" @@ -1912,7 +1887,7 @@ msgstr "" " --metalink-index=Sá» Sá» thứ tá»± Metalink application/" "metalink4+xml metaurl\n" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" @@ -1920,13 +1895,13 @@ msgstr "" " --metalink-over-http dùng siêu dữ liệu Metalink từ phần đầu " "HTTP trả vá»\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr " --preferred-location vị trí Æ°u tiên cho nguồn Metalink\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" @@ -1934,57 +1909,57 @@ msgstr "" " --no-xattr tắt kho chứa của siêu dữ liệu trong các " "thuá»™c tính tập tin mở rá»™ng\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "ThÆ° mục:\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories không tạo thÆ° mục.\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories ép buá»™c tạo thÆ° mục.\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories không tạo thÆ° mục máy.\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories dùng tên giao thức trong thÆ° mục.\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=TIỀN-Tá» ghi tập tin vào TIỀN-Tá»/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=Sá» lá»i Ä‘i Sá» thÆ° mục trên máy chủ.\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "Tùy chá»n HTTP:\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" " --http-user=TÀI-KHOẢN đặt ngÆ°á»i dùng http thành TÀI-KHOẢN này.\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" " --http-password=MKHẨU đặt mật khẩu http thành MẬT-KHẨU này.\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" " --no-cache không cho phép dữ liệu cache trên " "server.\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" @@ -1992,7 +1967,7 @@ msgstr "" " --default-page=TÊN thay đổi TÊN trang mặc định\n" " (bình thÆ°á»ng là “index.htmlâ€.).\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" @@ -2000,44 +1975,44 @@ msgstr "" " -E, --adjust-extension lÆ°u tài liệu HTML/CSS vá»›i phần mở rá»™ng " "phù hợp\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" " --ignore-length bá» qua trÆ°á»ng “Content-Length†của phần " "đầu.\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=CHUá»–I chèn CHUá»–I vào giữa các phần đầu.\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=KIỂU chá»n dạng mô tả tiến Ä‘á»™.\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" " --max-redirect số chuyển hÆ°á»›ng tối Ä‘a cho phép trên má»—i " "trang.\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" " --proxy-user=TÀIKHOẢN đặt TÀIKHOẢN làm tên ngÆ°á»i dùng ủy " "nhiệm.\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" " --proxy-password=MẬTKHẨU dùng MẬT KHẨU này để làm mật khẩu ủy " "nhiệm.\n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" @@ -2045,11 +2020,11 @@ msgstr "" " --referer=URL thêm phần đầu “Referer: URL†vào yêu cầu " "HTTP.\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers ghi phần đầu HTTP vào tập tin.\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" @@ -2057,30 +2032,30 @@ msgstr "" " -U, --user-agent=TÃC-NHÂN dùng đại diện này thay thế Wget/PHIÊN-" "BẢN.\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" " --no-http-keep-alive không giữ HTTP sống (kết nối lâu dài).\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies không dùng cookies.\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=TẬP-TIN lấy cookie từ TẬP-TIN trÆ°á»›c khi làm " "việc.\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" " --save-cookies=TẬP-TIN ghi cookie vào TẬP-TIN sau khi làm việc.\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" @@ -2088,7 +2063,7 @@ msgstr "" " --keep-session-cookies nạp và ghi cookie phiên làm việc (không\n" " thÆ°á»ng trá»±c).\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" @@ -2096,7 +2071,7 @@ msgstr "" " --post-data=CHUá»–I dùng phÆ°Æ¡ng pháp POST; gá»­i CHUá»–I làm dữ " "liệu.\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" @@ -2104,14 +2079,14 @@ msgstr "" " --post-file=TẬP-TIN dùng phÆ°Æ¡ng thức POST; gá»­i ná»™i dung của " "TẬP-TIN.\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" " --method=HTTPMethod dùng phÆ°Æ¡ng thức \"HTTPMethod\" trong " "phần đầu.\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2119,7 +2094,7 @@ msgstr "" " --body-data=CHUá»–I gá»­i CHUá»–I làm dữ liệu. --method phải được " "đặt.\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" @@ -2127,7 +2102,7 @@ msgstr "" " --body-file=TẬP-TIN gá»­i ná»™i dung của TẬP-TIN. --method phải " "được đặt.\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2139,7 +2114,7 @@ msgstr "" "cục bá»™\n" " (THỬ NGHIỆM)\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" @@ -2147,7 +2122,7 @@ msgstr "" " --content-on-error kết xuất ná»™i dung đã nhận vá»›i lá»—i trên " "máy chủ.\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2157,11 +2132,11 @@ msgstr "" " --auth-no-challenge gá»­i thông tin xác thá»±c HTTP CÆ¡ bản\n" " mà không đợi yêu cầu của máy phục vụ.\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "Tùy chá»n HTTPS (SSL/TLS):\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2171,55 +2146,55 @@ msgstr "" " --secure-protocol=PR chá»n giao thức bảo mật, má»™t trong số:\n" " auto, SSLv2, SSLv3, và PFS.\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" " --https-only chỉ theo các liên kết HTTPS bảo mật\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" " --no-check-certificate không kiểm tra tính hợp lệ của chứng\n" " thá»±c của máy chủ.\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" " --certificate=TẬP-TIN tập tin chứng nhận của ứng dụng khách\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" " --certificate-type=KIỂU dạng chứng nhận ứng dụng khách, PEM hoặc " "DER.\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=TẬP-TIN TẬP TIN chứa khóa riêng.\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" " --private-key-type=KIỂU kiểu chìa khóa riêng tÆ°, PEM hoặc DER.\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=TẬP-TIN tập tin đóng gói các CA.\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" " --ca-directory=DIR thÆ° mục chứa danh sách mã băm của CA.\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=TẬP-TIN tập tin đóng gói các CA.\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2237,7 +2212,7 @@ msgstr "" " để kiểm tra lại căn cứ vào mạng ngang " "hàng\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2245,22 +2220,22 @@ msgstr "" " --random-file=TẬP-TIN tập tin vá»›i dữ liệu theo xác suất\n" " để tạo thành SSL PRNG.\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" " --egd-file=TẬP-TIN đặt tên socket EGD vá»›i dữ liệu dữ liệu\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "Tùy chá»n HSTS:\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts tắt HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" @@ -2268,11 +2243,11 @@ msgstr "" " --hsts-file Ä‘Æ°á»ng dẫn của cÆ¡ sở dữ liệu HSTS (sẽ ghi " "đè theo mặc định)\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "Tùy chá»n FTP:\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" @@ -2280,38 +2255,38 @@ msgstr "" " --ftp-stmlf dùng định dạng Stream_LF cho má»i tập tin " "FTP nhị phân.\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" " --ftp-user=TÀI-KHOẢN dùng TÀI-KHOẢN này để đăng nhập ftp.\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" " --ftp-password=MẬT-KHẨU dùng mật khẩu này để đăng nhập ftp.\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing không xóa bá» tập tin “.listingâ€.\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" " --no-glob không dùng globbing cho tên tập tin FTP.\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" " --no-passive-ftp tắt chế Ä‘á»™ truyá»n \"passive\" (thụ " "Ä‘á»™ng).\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" " --preserve-permissions duy trì quyá»n của tập tin từ máy chủ.\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" @@ -2320,11 +2295,11 @@ msgstr "" "đến\n" " (không phải thÆ° mục).\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "Tùy chá»n FTPS:\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" @@ -2332,7 +2307,7 @@ msgstr "" " --ftps-implicit dùng FTPS ngầm định (cổng mặc định là " "990)\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2342,7 +2317,7 @@ msgstr "" "trong kết nối Ä‘iá»u khiển\n" " khi mở kết nối dữ liệu\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" @@ -2350,7 +2325,7 @@ msgstr "" " --ftps-clear-data-connection chỉ mã hóa kênh Ä‘iá»u khiển; má»i dữ " "liệu sẽ ở dạng thÆ°á»ng\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2358,11 +2333,11 @@ msgstr "" " --ftps-fallback-to-ftp quay lại dùng FTP nếu FTPS không được " "há»— trợ ở máy đích\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "Tùy chá»n vá» WARC:\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" @@ -2371,23 +2346,23 @@ msgstr "" "lá»i)\n" " vào tập tin .warc.gz.\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=CHUá»–I chèn CHUá»–I vào bản ghi warcinfo.\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" " --warc-max-size=SỠđặt kích thÆ°á»›c tối Ä‘a cho các tập tin " "WARC.\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx ghi tập tin chỉ mục CDX.\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" @@ -2395,17 +2370,17 @@ msgstr "" " --warc-dedup=TẬP-TIN không lÆ°u các bản ghi được liệt kê\n" " trong tập tin CDX này.\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" " --no-warc-compression không nén các tập tin WARC bằng GZIP.\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests không tính giá trị băm SHA1.\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" @@ -2413,7 +2388,7 @@ msgstr "" " --no-warc-keep-log không lÆ°u tập tin nhật ký trong bản ghi " "WARC.\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" @@ -2423,15 +2398,15 @@ msgstr "" "bởi\n" " bá»™ ghi WARC.\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "Tải đệ quy:\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive dùng tải đệ quy.\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2439,14 +2414,14 @@ msgstr "" " -l, --level=Sá» Ä‘á»™ sâu lá»›n nhất của đệ quy (inf hoặc 0 = " "vô hạn).\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" " --delete-after xóa tập tin ná»™i bá»™ sau khi tải xong.\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" @@ -2456,7 +2431,7 @@ msgstr "" "tải xuống\n" " chỉ tá»›i tập tin cục bá»™.\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2464,7 +2439,7 @@ msgstr "" " --convert-file-only chỉ chuyển đổi bá»™ phận tập tin của URL " "(thÆ°á»ng được đến là tên cÆ¡ sở)\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" @@ -2472,7 +2447,7 @@ msgstr "" " --backups=N trÆ°á»›c khi ghi tập tin X, sao lÆ°u thành N " "bản.\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" @@ -2480,7 +2455,7 @@ msgstr "" " -K, --backup-converted trÆ°á»›c khi chuyển đổi tập tin X, sao lÆ°u " "thành X_orig.\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" @@ -2488,7 +2463,7 @@ msgstr "" " -K, --backup-converted trÆ°á»›c khi chuyển đổi tập tin X,\n" " sao lÆ°u thành X.orig.\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" @@ -2496,7 +2471,7 @@ msgstr "" " -m, --mirror tùy chá»n rút gá»n tÆ°Æ¡ng Ä‘Æ°Æ¡ng vá»›i\n" " “-N -r -l inf --no-remove-listingâ€.\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" @@ -2504,7 +2479,7 @@ msgstr "" " -p, --page-requisites lấy má»i hình ảnh, v.v… cần thiết để\n" " hiển thị trang HTML.\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" @@ -2512,11 +2487,11 @@ msgstr "" " --strict-comments bật xá»­ lý chặt (SGML) cho chú thích " "HTML.\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "Chấp nhận/từ chối đệ quy:\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" @@ -2525,76 +2500,76 @@ msgstr "" "nhận\n" " được ngăn cách bằng dấu phẩy\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" " -R, --reject=DANH-SÃCH danh sách phần Ä‘uôi mở rá»™ng bị loại trừ\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" " --accept-regex=BTCQ chấp nhận các URL khá»›p biểu thức chính " "qui\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" " --reject-regex=BTCQ từ chối các URL khá»›p biểu thức chính qui\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" " --regex-type=KIỂU kiểu biểu thức chính qui (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=KIỂU kiểu biểu thức chính qui (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" " -D, --domains=DANH-SÃCH miá»n chấp nhận cách nhau bằng dấu phẩy\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" " --exclude-domains=DANH-SÃCH miá»n loại trừ cách nhau bằng dấu phẩy\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" " --follow-ftp theo liên kết FTP từ tài liệu HTML\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=DANH-SÃCH những thẻ HTML có thể theo\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=DANH-SÃCH những thẻ HTML bị bá» qua\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts Ä‘i tá»›i máy khác khi đệ quy\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative chỉ Ä‘i theo liên kết tÆ°Æ¡ng đối\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=DANH-SÃCH những thÆ° mục cho phép\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2603,84 +2578,84 @@ msgstr "" " --trust-server-names dùng tên được chỉ định bởi thành phần\n" " cuối cùng của địa chỉ URL chuyển hÆ°á»›ng\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=DANH-SÃCH những thÆ° mục loại trừ\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent không Ä‘i ngược lên thÆ° mục mẹ\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" "Gá»­i báo cáo lá»—i và gợi ý tá»›i \n" "Gá»­i thông báo vá» lá»—i dịch cho \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s, chÆ°Æ¡ng trình tải dữ liệu từ mạng không tÆ°Æ¡ng tác.\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "Mật khẩu cho tài khoản %s: " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "Mật khẩu: " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "Không thể tạo ống dẫn\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" "Gặp lá»—i khi khởi tạo thao tác sản sinh tập tin dùng cho use-askpass: %d\n" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "Lá»—i cài đặt thao tác sản sinh tập tin để dùng cho use-askpass: %d\n" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "Gặp lá»—i khi Ä‘á»c trả lá»i từ lệnh \"%s %s\": %s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "Tài khoản cho “%s%sâ€: " -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "Mật khẩu cho “%s%s@%sâ€: " -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "Miá»n địa phÆ°Æ¡ng: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "Biên dịch: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "Liên kết: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2689,29 +2664,29 @@ msgstr "" "GNU Wget %s được biên dịch dành cho %s.\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (môi trÆ°á»ng)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (ngÆ°á»i dùng)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (hệ thống)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Tác quyá»n © năm %s của Tổ chức Phần má»m Tá»± do, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2725,7 +2700,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2733,38 +2708,38 @@ msgstr "" "\n" "Nguyên bản được viết bởi Hrvoje Niksic .\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" "Hãy gá»­i thông báo lá»—i và các câu há»i cho .\n" "Thông báo lá»—i dịch cho: .\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "Vấn Ä‘á» vá» cấp phát bá»™ nhá»›\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "Thoát ra bởi vì lá»—i trong %s\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "Thá»­ “%s --help†để biết thêm tùy chá»n.\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: tùy chá»n không hợp lệ -- “-n%câ€\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "Việc há»— trợ gỡ lá»—i không được biên dịch cùng. Bá» qua cá» --debug\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2773,7 +2748,7 @@ msgstr "" "Nếu cả hai tùy chá»n --no-clobber và --convert-links được chỉ ra, chỉ --" "convert-links được dùng.\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" @@ -2782,24 +2757,24 @@ msgstr "" "Cả hai tùy chá»n --no-clobber và --convert-file-only được chỉ ra, chỉ --" "convert-file-only được dùng.\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "Không thể dùng --verbose và --quiet cùng lúc.\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" "Không thể cùng má»™t lúc đánh dấu thá»i gian và không ghi đè tập tin cÅ©.\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" "Không thể chỉ ra đồng thá»i cả hai tùy chá»n --inet4-only và --inet6-only.\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2810,7 +2785,7 @@ msgstr "" "URL, hoặc dùng kèm\n" "vá»›i -p hay -r. Xem sổ tay để biết chi tiết.\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2819,7 +2794,7 @@ msgstr "" "CẢNH BÃO: tổ hợp tùy chá»n “-O†vá»›i “-r†hay “-p†gây ra\n" "tất cả ná»™i dung đã tải lên được đặt vào tập tin riêng lẻ bạn đã chỉ ra.\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2829,12 +2804,7 @@ msgstr "" "Xem sổ tay để tìm chi tiết.\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "Tập tin “%s†đã có ở đây nên không nhận lại nữa.\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" @@ -2842,7 +2812,7 @@ msgstr "" "Kết xuất WARC không làm việc vá»›i tùy chá»n --no-clobber, --no-clobber sẽ bị " "tắt Ä‘i.\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" @@ -2850,12 +2820,12 @@ msgstr "" "Kết xuất WARC không làm việc vá»›i tùy chá»n timestamping, timestamping sẽ bị " "tắt Ä‘i.\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "Kết xuất WARC không làm việc vá»›i tùy chá»n --spider.\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " @@ -2864,14 +2834,14 @@ msgstr "" "Kết xuất WARC không làm việc vá»›i tùy chá»n --continue hay --start-pos, chúng " "sẽ bị tắt Ä‘i.\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" "Tóm lược (mã băm) bị tắt Ä‘i; WARC sẽ không tìm những bản ghi trùng nhau.\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " @@ -2880,14 +2850,14 @@ msgstr "" "Kết xuất WARC không làm việc vá»›i tùy chá»n --continue hay --start-pos, chúng " "sẽ bị tắt Ä‘i.\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" "Không thể chỉ ra đồng thá»i cả hai tùy chá»n “--ask-password†và “--" "passwordâ€.\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2895,18 +2865,18 @@ msgid "" msgstr "" "Chỉ ra cả --start-pos và --continue là không nên; --continue sẽ bị tắt.\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: thiếu URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" "Không thể chỉ ra đồng thá»i cả hai tùy chá»n “--post-data†và “--post-fileâ€.\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2915,7 +2885,7 @@ msgstr "" "Bạn không thể dùng tùy chá»n --post-data hay --post-file cùng vá»›i --method. --" "method cần dữ liệu thông qua các tùy chá»n --body-data và --body-file\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2924,18 +2894,18 @@ msgstr "" "Bạn phải chá»n phÆ°Æ¡ng thức thông qua --method=HTTPMethod hay dùng vá»›i --body-" "data hoặc --body-file.\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" "Không thể chỉ ra đồng thá»i cả hai tùy chá»n --body-data và --body-file.\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "Phiên bản này không há»— trợ IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" @@ -2943,7 +2913,7 @@ msgstr "" "“-k†hay “-r†chỉ có thể được dùng cùng vá»›i “-O†chỉ khi xuất vào má»™t tập " "tin thông thÆ°á»ng.\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2952,42 +2922,42 @@ msgstr "" "--convert-links hay --convert-file-only chỉ có thể được dùng cùng vá»›i nhau " "chỉ khi xuất vào má»™t tập tin thông thÆ°á»ng.\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "Gặp lá»—i khi khởi tạo libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "Gặp lá»—i khi khởi tạo kênh c-ares\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "Gặp lá»—i khi phân tích địa chỉ IP %s\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "Gặp lá»—i khi đặt máy phục vụ DNS “%s†(%d).\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "Không tìm thấy địa chỉ URL trong %s.\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "Không thể phân tích cú pháp tập tin metalink %s.\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "Không thể tải vá» má»i nguồn tài nguyên từ %s.\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2998,7 +2968,7 @@ msgstr "" "Tổng thá»i gian: %s\n" "Äã tải vá»: %d tập tin, %s trong %s (%s)\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "VƯỢT GIỚI HẠN tải vá» %s!\n" @@ -3154,104 +3124,104 @@ msgstr "Tập tin %s đã được tải vá» nhÆ°ng chữ ký lại không kh msgid "Renaming %s to %s.\n" msgstr "Äang đổi %s thành %s.\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "Tiếp tục chạy ná»n.\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "Tiếp tục ở ná»n, pid %lu.\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "Kết quả sẽ được ghi vào %s.\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() (giả tạo tiến trình con?) gặp lá»—i\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() gặp lá»—i\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: Không tìm thấy trình Ä‘iá»u khiển ổ cắm dùng được.\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "ioctl() gặp lá»—i. á»” cắm không thể được đặt nhÆ° là kiểu khối.\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: cảnh báo: hiệu bài %s xuất hiện trÆ°á»›c bất kỳ tên máy nào\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: không rõ hiệu bài “%sâ€\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "Cách dùng: %s NETRC [TÊN MÃY]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s: không thể lấy thống kê (stat) %s: %s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "CẢNH BÃO: sá»­ dụng mầm số ngẫu nhiên yếu.\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "Không thể tạo mầm PRNG, coi nhÆ° sá»­ dụng --random-file.\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "Phiên bản OpenSSL của bạn quá cÅ© để há»— trợ TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL: giá trị tùy chá»n “secure-protocol†chÆ°a được thá»±c hiện %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: không thể thẩm tra chứng nhận của %s, cấp bởi %s:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " Không thể thẩm tra cục bá»™ quyá»n của nhà cấp.\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " Gặp chứng nhận tá»± ký.\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " Chứng nhận đã cấp nhÆ°ng chÆ°a hợp lệ.\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " Chứng nhận đã cấp cÅ©ng đã hết hạn dùng.\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3260,7 +3230,7 @@ msgstr "" "%s: không có tên thay thế của chủ thể chứng nhận mà\n" "\ttÆ°Æ¡ng ứng vá»›i tên máy yêu cầu %s.\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" @@ -3268,7 +3238,7 @@ msgstr "" " %s: tên thÆ°á»ng gá»i của chứng nhận %s không tÆ°Æ¡ng ứng tên máy yêu cầu " "%s.\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3280,12 +3250,12 @@ msgstr "" "vệ\n" " (do vậy, máy không phải là %s thật).\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "Äể kết nối không an toàn tá»›i %s, hãy dùng “-no-check-certificateâ€.\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3294,28 +3264,28 @@ msgstr "" "\n" "%*s[ nhảy qua %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "Lá»—i trong định dạng dấu chấm %s, để nguyên.\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " cần %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " trong " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "Không thể lấy tần số đồng hồ THỜI GIAN THá»°C: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "Xóa %s vì nó sẽ bị từ chối.\n" @@ -3329,22 +3299,22 @@ msgstr "Không thể mở %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "Äang tải robots.txt; xin hãy bá» qua các thông báo lá»—i.\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "Lá»—i phân tích URL của proxy %s: %s.\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "Lá»—i trong URL của proxy %s: Phải là HTTP.\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "Vượt quá mức giá»›i hạn %d lần chuyển hÆ°á»›ng.\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3352,7 +3322,7 @@ msgstr "" "Chịu thua.\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3360,125 +3330,125 @@ msgstr "" "Äang thá»­ lại.\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "Không có lá»—i" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "Lược đồ không được há»— trợ %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "Thiếu lược đồ" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "Sai tên máy" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "Sai số hiệu cổng" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "Sai tên ngÆ°á»i dùng" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "Äịa chỉ số IPv6 không có giá»›i hạn" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "Không há»— trợ địa chỉ IPv6" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "Sai địa chỉ IPv6 dạng số" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "ChÆ°a biên dịch để há»— trợ HTTPS" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "Gặp chuá»—i byte không hoàn chỉnh hoặc không hợp lệ\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: Gặp lá»—i khi cấp pháp đủ bá»™ nhá»›; do hết bá»™ nhá»›.\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: Gặp lá»—i khi cấp phát %ld byte; do hết bá»™ nhá»›.\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: vùng đệm văn bản quá lá»›n (%d byte), nên hủy bá».\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "Tiếp tục chạy ná»n, pid %d.\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "Bá» liên kết má»m %s không thành công: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "Gặp lá»—i khi khởi tạo libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "Gặp lá»—i khi phân quyá»n cho %s.\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "Gặp lá»—i khi phân quyá»n cho %s.\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "Gặp lá»—i khi phân tích địa chỉ IP %s\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "Gặp lá»—i khi phân quyá»n cho %s.\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "Biểu thức chính qui không hợp lệ %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "Gặp lá»—i khi so khá»›p %s: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3560,6 +3530,24 @@ msgstr "" "Tìm thấy khá»›p hoàn toàn trong tập tin CDX. Äang ghi bản ghi truy cập lại vào " "WARC.\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: không nhận ra tùy chá»n “--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ ràng\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: tùy chá»n “-W %s†cần má»™t đối số\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "Tập tin “%s†đã có ở đây nên không nhận lại nữa.\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/wget.pot b/po/wget.pot index b9191f8..5395209 100644 --- a/po/wget.pot +++ b/po/wget.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU wget 1.19.2\n" +"Project-Id-Version: GNU wget 1.19.3\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "" @@ -26,7 +26,7 @@ msgstr "" msgid "Address family for hostname not supported" msgstr "" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "" @@ -94,70 +94,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" +msgid "%s: unrecognized option '%s%s'\n" msgstr "" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -177,13 +152,13 @@ msgstr "" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -255,28 +230,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -295,51 +270,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "" -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "" -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "" -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -373,174 +348,174 @@ msgstr "" msgid "Cannot back up %s as %s: %s\n" msgstr "" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "" -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "" -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "" -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "" -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "" -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr "" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr "" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "" -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "" -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "" -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -548,536 +523,536 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" "\n" msgstr "" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" msgstr "" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" "\n" msgstr "" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" "\n" msgstr "" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "" -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" "\n" msgstr "" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" "\n" msgstr "" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" "\n" msgstr "" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" "\n" msgstr "" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "" -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" "\n" msgstr "" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "" -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr "" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1085,199 +1060,199 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" "\n" msgstr "" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "" -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" "\n" msgstr "" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" msgstr "" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" "\n" msgstr "" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" "\n" msgstr "" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "" -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "" -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "" -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "" -#: src/init.c:582 +#: src/init.c:581 #, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1285,7 +1260,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1293,422 +1268,422 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "" -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" "Redirecting output to %s.\n" msgstr "" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" msgstr "" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr "" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr "" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr "" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr "" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr "" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr "" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr "" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr "" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr "" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr "" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr "" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr "" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr "" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr "" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" msgstr "" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr "" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr "" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr "" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr "" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr "" -#: src/main.c:635 +#: src/main.c:644 msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr "" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr "" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr "" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr "" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr "" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr "" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr "" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr "" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" msgstr "" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr "" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr "" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr "" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr "" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr "" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr "" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr "" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" msgstr "" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr "" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr "" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr "" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr "" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr "" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" " one of IPv6, IPv4, or none\n" msgstr "" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr "" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1719,211 +1694,211 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr "" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr "" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr "" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr "" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr "" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr "" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr "" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr "" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr "" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr "" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr "" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr "" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr "" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr "" -#: src/main.c:770 +#: src/main.c:779 msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr "" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr "" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr "" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr "" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr "" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr "" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr "" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr "" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr "" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr "" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -1931,13 +1906,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -1945,58 +1920,58 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "" -#: src/main.c:819 +#: src/main.c:828 msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " "SSLv2,\n" " SSLv3, TLSv1, TLSv1_1, TLSv1_2 and PFS\n" msgstr "" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr "" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr "" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr "" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr "" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr "" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr "" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr "" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr "" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr "" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2006,405 +1981,405 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" msgstr "" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr "" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr "" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr "" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr "" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr "" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr "" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr "" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr "" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr "" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr "" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr "" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr "" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr "" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr "" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr "" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr "" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr "" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr "" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr "" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr "" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr "" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr "" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr "" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr "" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr "" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr "" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr "" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr "" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr "" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr "" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2414,71 +2389,71 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" msgstr "" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2486,157 +2461,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2644,7 +2614,7 @@ msgid "" "Downloaded: %d files, %s in %s (%s)\n" msgstr "" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "" @@ -2800,117 +2770,117 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -2918,40 +2888,40 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" "%*s[ skipping %sK ]" msgstr "" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "" @@ -2965,151 +2935,151 @@ msgstr "" msgid "Loading robots.txt; please ignore errors.\n" msgstr "" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" msgstr "" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" msgstr "" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "" -#: src/utils.c:884 +#: src/utils.c:879 #, c-format msgid "Failed to Fopen file %s\n" msgstr "" -#: src/utils.c:890 +#: src/utils.c:885 #, c-format msgid "Failed to get FD for file %s\n" msgstr "" -#: src/utils.c:897 +#: src/utils.c:892 #, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "" -#: src/utils.c:948 +#: src/utils.c:943 #, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index f324d9f..0d1553f 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 502ce2f..54605d5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,24 +8,25 @@ # Anthony Fok , 2010, 2011. # Mingcong Bai , 2015. # Mingye Wang , 2015, 2017. +# Boyuan Yang <073plan@gmail.com>, 2017. # msgid "" msgstr "" "Project-Id-Version: wget 1.18.109\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" -"PO-Revision-Date: 2017-01-18 21:48-0500\n" -"Last-Translator: Mingye Wang (Arthur2e5) \n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" +"PO-Revision-Date: 2017-11-15 22:30+0800\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.11\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 2.0.4\n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "未知的系统错误" @@ -33,7 +34,7 @@ msgstr "未知的系统错误" msgid "Address family for hostname not supported" msgstr "主机å的地å€å®¶æ—ä¸è¢«æ”¯æŒ" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "å字解æžæ—¶æœ‰ä¸´æ—¶é”™è¯¯" @@ -101,70 +102,45 @@ msgstr "被信å·ä¸­æ–­" msgid "Parameter string not correctly encoded" msgstr "å‚数字符串未正确编ç " -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "未知错误" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s：选项 \"%s\" 有歧义；å¯èƒ½æ€§æœ‰ï¼š" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s：选项“%sâ€ä¸æ˜Žç¡®\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s：选项“--%sâ€ä¸å…许有å‚æ•°\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s：选项 \"%s\" 有歧义；å¯èƒ½æ€§æœ‰ï¼š" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s：无法识别的选项“%c%sâ€\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s：选项“%c%sâ€ä¸å…许有å‚æ•°\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s：选项“%sâ€éœ€è¦å‚æ•°\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s：无法识别的选项“--%sâ€\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s：无法识别的选项“%c%sâ€\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：无效选项 -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：选项需è¦å‚æ•° -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s：选项“-W %sâ€ä¸æ˜Žç¡®\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s：选项“-W %sâ€ä¸å…许有å‚æ•°\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s：选项“%sâ€éœ€è¦å‚æ•°\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -184,13 +160,13 @@ msgstr "%s：选项“%sâ€éœ€è¦å‚æ•°\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -262,28 +238,28 @@ msgstr "正则表达å¼è¿‡é•¿" msgid "Unmatched ) or \\)" msgstr "未匹é…çš„ ) 或 \\)" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "缺少之å‰çš„正则表达å¼" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "无法创建管é“" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "%s å­è¿›ç¨‹å¤±è´¥" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle 失败" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "无法还原 fd %d: dup2 失败" @@ -302,51 +278,51 @@ msgstr "%s å­è¿›ç¨‹æ”¶åˆ°è‡´å‘½ä¿¡å· %d" msgid "memory exhausted" msgstr "内存耗尽" -#: src/connect.c:202 +#: src/connect.c:200 #, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: æ— æ³•è§£æž bind åœ°å€ %sï¼›ç¦ç”¨ bind。\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "正在连接 %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "正在连接 %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, c-format msgid "Connecting to [%s]:%d... " msgstr "正在连接 [%s]:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "setsockopt SO_RCVBUF 失败：%s\n" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "已连接。\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "失败：%s。\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: 无法解æžä¸»æœºåœ°å€ %s\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "setsockopt SO_REUSEADDR 失败：%s\n" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "打开太多文件æ述符了。select 最多åªèƒ½ç”¨äºŽ %d å·æ述符\n" @@ -380,174 +356,174 @@ msgstr "无法删除 %s: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "无法将 %s å¤‡ä»½æˆ %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, c-format msgid "Unable to get cookie for %s\n" msgstr "æ— æ³•èŽ·å– %s çš„ cookie\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "在 Set-Cookie 中出现语法错误：%s 在ä½ç½® %d 处。\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "æ¥è‡ª %s çš„ Cookie å°è¯•å°†åŸŸè®¾ç½®ä¸º " -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "无法打开 cookie 文件 %s: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, c-format msgid "Error writing to %s: %s\n" msgstr "写入 %s æ—¶å‘生错误: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, c-format msgid "Error closing %s: %s\n" msgstr "关闭 %s æ—¶å‘生错误: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "ä¸æ”¯æŒçš„文件列表类型，试用 Unix æ ¼å¼çš„列表æ¥åˆ†æžã€‚\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s 的索引，在 %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "未知的时间 " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "文件 " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "目录 " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "链接 " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "ä¸ç¡®å®š " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s 字节)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "长度：%s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "，剩余 %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "，剩余 %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (éžæ­£å¼æ•°æ®)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "ä¸èƒ½åˆå§‹åŒ– SSL，因此将ç¦ç”¨ä¹‹ã€‚" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "正在以 %s 登录 ... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "æœåŠ¡å™¨å“应时å‘生错误，正在关闭控制连接。\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "æœåŠ¡å™¨æ¶ˆæ¯å‡ºçŽ°é”™è¯¯ã€‚\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "写入失败，正在关闭控制连接。\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "æœåŠ¡å™¨æ‹’ç»ç™»å½•ã€‚\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "登录ä¸æ­£ç¡®ã€‚\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "登录æˆåŠŸï¼\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "æœåŠ¡å™¨ä¸æŽ¥å—‘PBSZ 0’命令。\n" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "æœåŠ¡å™¨ä¸æŽ¥å—‘PROT %c’命令。\n" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "æœåŠ¡å™¨é”™è¯¯ï¼Œæ— æ³•ç¡®å®šæ“作系统的类型。\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "完æˆã€‚ " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "完æˆã€‚\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "未知的类别“%câ€ï¼Œæ­£åœ¨å…³é—­æŽ§åˆ¶è¿žæŽ¥ã€‚\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "完æˆã€‚ " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> ä¸éœ€è¦ CWD。\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "进入了 getftp() 中逻辑上ä¸å¯èƒ½çš„段è½" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -558,7 +534,7 @@ msgstr "" "cwd_start: %d\n" "cwd_end: %d\n" -#: src/ftp.c:971 +#: src/ftp.c:970 #, c-format msgid "" "No such directory %s.\n" @@ -567,37 +543,37 @@ msgstr "" "目录 %s ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> ä¸éœ€è¦ CWD。\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 msgid "File has already been retrieved.\n" msgstr "该文件已ç»è¢«èŽ·å–了。\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "无法å¯åŠ¨ PASV 传输。\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "æ— æ³•è§£æž PASV å“应内容。\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "无法连接到 %s 端å£å· %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind 错误 (%s)。\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT 命令无效。\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,17 +581,17 @@ msgstr "" "\n" "断点续传 (REST) 失败，é‡å¤´å¼€å§‹ä¸‹è½½ã€‚\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "文件 %s 已存在。\n" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, c-format msgid "No such file %s.\n" msgstr "文件 %s ä¸å­˜åœ¨ã€‚\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, c-format msgid "" "No such file %s.\n" @@ -624,7 +600,7 @@ msgstr "" "文件 %s ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, c-format msgid "" "No such file or directory %s.\n" @@ -633,40 +609,40 @@ msgstr "" "文件或目录 %s ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s çªç„¶å‡ºçŽ°ã€‚\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s：%s，正在关闭控制连接。\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) - æ•°æ®è¿žæŽ¥ï¼š%sï¼›" -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "已关闭控制连接。\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "æ•°æ®ä¼ è¾“已被中止。\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, c-format msgid "File %s already there; not retrieving.\n" msgstr "文件 %s 已存在；ä¸èŽ·å–。\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(å°è¯•æ¬¡æ•°ï¼š%2d)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -675,7 +651,7 @@ msgstr "" "%s (%s) - 已写入标准输出 %s[%s]\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -684,40 +660,40 @@ msgstr "" "%s (%s) - %s å·²ä¿å­˜ [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "正在删除 %s。\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, c-format msgid "Using %s as listing tmp file.\n" msgstr "使用 %s 作为列表临时文件。\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, c-format msgid "Removed %s.\n" msgstr "已删除 %s。\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "链接递归深度 %d 超过最大值 %d。\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "远程文件比本地文件 %s æ›´è€ -- ä¸èŽ·å–。\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "远程文件较本地文件 %s æ–° -- 获å–。\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -726,11 +702,11 @@ msgstr "" "文件大å°ä¸ç¬¦ (本地文件 %s) -- 获å–。\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "无效的符å·è¿žæŽ¥å，跳过。\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -739,238 +715,238 @@ msgstr "" "å·²ç»å­˜åœ¨æ­£ç¡®çš„符å·è¿žæŽ¥ %s -> %s\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "正在创建符å·é“¾æŽ¥ %s -> %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "ä¸æ”¯æŒç¬¦å·è¿žæŽ¥ï¼Œæ­£åœ¨è·³è¿‡ç¬¦å·è¿žæŽ¥ %s。\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, c-format msgid "Skipping directory %s.\n" msgstr "正在跳过目录 %s。\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s：未知的/ä¸æ”¯æŒçš„文件类型。\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, c-format msgid "Failed to set permissions for %s.\n" msgstr "无法设定 %s çš„æƒé™\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s：错误的时间戳标记。\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "因为目录深度为 %d (最大值为 %d)，所以ä¸èŽ·å–目录。\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "ä¸è¿›å…¥ %s 目录因为其已被排除或未被包å«è¿›æ¥ã€‚\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, c-format msgid "Rejecting %s.\n" msgstr "æ‹’ç» %s。\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, c-format msgid "Error matching %s against %s: %s\n" msgstr "%s å’Œ %s 匹é…错误: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, c-format msgid "No matches on pattern %s.\n" msgstr "æ²¡æœ‰ä¸Žæ¨¡å¼ %s 相符åˆçš„。\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "å·²ç»å°† HTML æ ¼å¼çš„索引写入到 %s [%s]。\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "å·²ç»å°† HTML æ ¼å¼çš„索引写入到 %s。\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "错误：无法打开目录 %s。\n" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "错误：无法打开è¯ä¹¦ %s：(%d)。\n" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "已载入 CA è¯ä¹¦â€œ%sâ€\n" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "错误：无法加载 CRL 文件‘%s’: (%d)\n" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "已加载 CRL 文件‘%s’\n" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "错误：GnuTLS è¦æ±‚密钥和è¯ä¹¦å…·æœ‰ç›¸åŒçš„类型。\n" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, fuzzy, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "GnuTLS：未实现‘secure-protocol’选项值 %d\n" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "请将此问题报告到 bug-wget@gnu.org\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "GnuTLS：未实现‘secure-protocol’选项值 %d\n" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "错误" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s: %s 未æ出è¯ä¹¦ã€‚\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s: %s çš„è¯ä¹¦ä¸å¯ä¿¡ã€‚\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "%s: %s çš„è¯ä¹¦é¢å‘者未知。\n" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s: %s çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s: è¯ä¹¦ %s çš„ç­¾å‘者ä¸æ˜¯ä¸€ä¸ª CA。\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "%s: %s çš„è¯ä¹¦ä½¿ç”¨ä¸å®‰å…¨çš„算法签å。\n" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "%s: %s çš„è¯ä¹¦è¿˜æœªç”Ÿæ•ˆã€‚\n" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s: %s çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "åˆå§‹åŒ– X509 è¯ä¹¦é”™è¯¯: %s\n" -#: src/gnutls.c:813 +#: src/gnutls.c:812 msgid "No certificate found\n" msgstr "未找到è¯ä¹¦\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, c-format msgid "Error parsing certificate: %s\n" msgstr "解æžè¯ä¹¦æ—¶å‘生错误: %s。\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "è¯ä¹¦è¿˜æœªæ¿€æ´»\n" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "è¯ä¹¦å·²ç»è¿‡æœŸ\n" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "è¯ä¹¦æ‰€æœ‰è€…与主机å %s ä¸ç¬¦\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "公钥与固定的公钥ä¸åŒ¹é…ï¼\n" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "è¯ä¹¦å¿…须是 X.509 æ ¼å¼\n" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "处ç†åœ°å€åˆ—表时出错。\n" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "未知的主机" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "正在解æžä¸»æœº %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "失败：主机没有 IPv4/IPv6 地å€ã€‚\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "失败：超时。\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s：无法解æžä¸å®Œæ•´çš„链接 %s。\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s：无效的 URL %s: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "无法写入 HTTP 请求：%s。\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "没有 HTTP 头，å‡å®šä¸º HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, c-format msgid "" "File %s already there; not retrieving.\n" @@ -979,65 +955,65 @@ msgstr "" "文件 %s å·²ç»å­˜åœ¨ï¼›ä¸èŽ·å–。\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "gmtime 失败。这å¯èƒ½æ˜¯ä¸€ä¸ª bug。\n" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "ä¸èƒ½è½¬æ¢ä¸º http æ ¼å¼çš„时间戳。将最åŽä¿®æ”¹æ—¶é—´å›žè½åˆ° 0。\n" -#: src/http.c:1986 +#: src/http.c:1987 #, c-format msgid "BODY data file %s missing: %s\n" msgstr "缺少 BODY æ•°æ®æ–‡ä»¶ %s: %s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "é‡ç”¨å·²æœ‰çš„的到 [%s]:%d 的连接\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "å†æ¬¡ä½¿ç”¨å­˜åœ¨çš„到 %s:%d 的连接。\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "无法读å–代ç†å“应：%s\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 错误 %d：%s。\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ä¸æ­£å¸¸çš„状æ€è¡Œ" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "代ç†æ¸ é“错误: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "未知的验è¯æ–¹å¼ã€‚\n" -#: src/http.c:2435 +#: src/http.c:2436 #, c-format msgid "Authentication selected: %s\n" msgstr "选定的验è¯æ–¹å¼ï¼š%s\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "正在ä¿å­˜è‡³: %s\n" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" @@ -1046,20 +1022,20 @@ msgstr "" "当下载签å:\n" "%s: %s 时。\n" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "无法从临时文件读å–ç­¾å内容。跳过。\n" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "无法创建临时文件。跳过签å下载。\n" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "pri 值无效。å‡å®šä¸º %d。\n" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" @@ -1067,42 +1043,42 @@ msgstr "" "无法为 Metalink 资æºæ‰¾åˆ°ä»»ä½•å¯æŽ¥å—的摘è¦ã€‚\n" "将忽略这些资æºã€‚\n" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "由于é­é‡é”™è¯¯ï¼Œå°†ç¦ç”¨ SSL。\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "å·²å‘出 %s 请求，正在等待回应... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "没有接收到数æ®ã€‚\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "读å–文件头错误 (%s)。\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(没有æè¿°)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "ä½ç½®ï¼š%s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "未指定" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [è·Ÿéšè‡³æ–°çš„ URL]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" @@ -1111,7 +1087,7 @@ msgstr "" "文件 %s 在æœåŠ¡å™¨ä¸Šæœªè¢«æ›´æ”¹ã€‚忽略此下载。\n" "\n" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1122,7 +1098,7 @@ msgstr "" "你也许应该附加 --no-if-modified-since 选项。\n" "\n" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1132,80 +1108,80 @@ msgstr "" " 文件已下载完æˆï¼›ä¸ä¼šè¿›è¡Œä»»ä½•æ“作。\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "长度：" -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "已忽略" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告：HTTP ä¸æ”¯æŒé€šé…符。\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "打开 Spider 模å¼ã€‚检查是å¦å­˜åœ¨è¿œç¨‹æ–‡ä»¶ã€‚\n" -#: src/http.c:4353 +#: src/http.c:4378 #, c-format msgid "Cannot write to %s (%s).\n" msgstr "无法写入 %s (%s)。\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "接收的å“应头中缺少必è¦çš„属性。\n" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "用户å/密ç è®¤è¯å¤±è´¥ã€‚\n" -#: src/http.c:4375 +#: src/http.c:4400 msgid "Cannot write to WARC file.\n" msgstr "无法写入 WARC 文件。\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "无法写入临时 WARC 文件。\n" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "无法建立 SSL 连接。\n" -#: src/http.c:4392 +#: src/http.c:4417 #, c-format msgid "Cannot unlink %s (%s).\n" msgstr "无法清除 %s 的链接 (%s)。\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "错误：é‡å®šå‘ (%d) 但没有指定ä½ç½®ã€‚\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "无法从 HTTP å“应中找到 Metalink æ•°æ®ã€‚使用 HTTP GET 下载文件。\n" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "å‘现 Metalink å“应头。将切æ¢åˆ° Metalink 模å¼ã€‚\n" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "远程文件ä¸å­˜åœ¨ -- 链接失效ï¼ï¼ï¼\n" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少“Last-modifiedâ€æ–‡ä»¶å¤´ -- 关闭时间戳标记。\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "无效的“Last-modifiedâ€æ–‡ä»¶å¤´ -- 忽略时间戳标记。\n" -#: src/http.c:4538 +#: src/http.c:4563 #, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1214,16 +1190,16 @@ msgstr "" "远程文件比本地文件 %s æ›´è€ -- ä¸èŽ·å–。\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "文件大å°ä¸ç¬¦ (本地文件 %s) -- 获å–。\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "远程文件较新，获å–。\n" -#: src/http.c:4573 +#: src/http.c:4598 msgid "" "Remote file exists and could contain links to other resources -- " "retrieving.\n" @@ -1232,7 +1208,7 @@ msgstr "" "存在远程文件且å¯èƒ½å«æœ‰åˆ°å…¶å®ƒèµ„æºçš„链接 -- 获å–。\n" "\n" -#: src/http.c:4579 +#: src/http.c:4604 msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" @@ -1240,7 +1216,7 @@ msgstr "" "存在远程文件但ä¸å«ä»»ä½•é“¾æŽ¥ -- 无法获å–。\n" "\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" @@ -1250,7 +1226,7 @@ msgstr "" "但ä¸èƒ½è¿›è¡Œé€’å½’æ“作 -- 无法获å–。\n" "\n" -#: src/http.c:4594 +#: src/http.c:4619 msgid "" "Remote file exists.\n" "\n" @@ -1258,12 +1234,12 @@ msgstr "" "存在远程文件。\n" "\n" -#: src/http.c:4603 +#: src/http.c:4628 #, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s URL: %s %2d %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1272,7 +1248,7 @@ msgstr "" "%s (%s) - 已写入至标准输出 %s[%s/%s]\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1281,58 +1257,58 @@ msgstr "" "%s (%s) - å·²ä¿å­˜ %s [%s/%s])\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s 字节处连接关闭。" -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 在 %s 字节处å‘生读å–错误 (%s)。" -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 在 %s/%s 字节处å‘生读å–错误 (%s)。" -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "ä¸æ”¯æŒçš„ä¿æŠ¤è´¨é‡ '%s'。\n" -#: src/http.c:4990 +#: src/http.c:5015 #, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "ä¸æ”¯æŒçš„算法‘%s’。\n" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRCæŒ‡å‘ %s，但它并ä¸å­˜åœ¨ã€‚\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%sï¼šæ— æ³•è¯»å– %s (%s)。\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%1$s：错误å‘生于第 %3$d 行的 %2$s。\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%1$s: 第 %3$d 行的 %2$s 处å‘生语法错误。\n" -#: src/init.c:711 +#: src/init.c:710 #, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%1$s: 未知的命令 %2$s 在第 %4$d è¡Œ %3$s 处。\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1343,7 +1319,7 @@ msgstr "" "'%s'，\n" "或使用 --config å‚数指定å¦ä¸€ä¸ªé…置文件。\n" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1354,76 +1330,78 @@ msgstr "" "'%s'，\n" "或使用 --config å‚数指定å¦ä¸€ä¸ªé…置文件。\n" -#: src/init.c:781 +#: src/init.c:780 #, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s：警告：系统与用户的 wgetrc éƒ½æŒ‡å‘ %s。\n" -#: src/init.c:976 +#: src/init.c:975 #, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s：无效的 --execute 命令 %s\n" -#: src/init.c:1037 +#: src/init.c:1036 #, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s：%s：无效的布尔值 %s；请使用“onâ€æˆ–“offâ€ã€‚\n" -#: src/init.c:1070 +#: src/init.c:1069 #, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s：%s：无效的 %s；请使用“onâ€ã€â€œoffâ€æˆ–“quietâ€ã€‚\n" -#: src/init.c:1088 +#: src/init.c:1087 #, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s：%s：无效数字 %s。\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "%s: %s åªèƒ½å•æ¬¡ä½¿ç”¨\n" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s：%s：无效的字节数值 %s\n" -#: src/init.c:1368 +#: src/init.c:1367 #, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s：%s：无效的时间周期 %s\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" +"use-askpass 功能需è¦å¾—到一个字符串å‚数，或是è¦æ±‚环境å˜é‡ WGET_ASKPASS 或 " +"SSH_ASKPASS 被设置。\n" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s：%s：无效的值 %s。\n" -#: src/init.c:1504 +#: src/init.c:1503 #, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s：%s：无效的文件头 %s。\n" -#: src/init.c:1525 +#: src/init.c:1524 #, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s：%s：无效的 WARC 头 %s。\n" -#: src/init.c:1591 +#: src/init.c:1590 #, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s：%sï¼šæ— æ•ˆçš„è¿›åº¦æŒ‡ç¤ºæ–¹å¼ %s。\n" # 对应å‚数是逗å·åˆ†éš”的一个列表，ä¸è¦å˜æˆé¡¿å·ã€‚ -#: src/init.c:1673 +#: src/init.c:1672 #, c-format msgid "" "%s: %s: Invalid restriction %s,\n" @@ -1432,40 +1410,40 @@ msgstr "" "%s：%s：无效的é™å®šé¡¹ %s，\n" " 请使用 [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii]。\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "ç¼–ç  %s 无效\n" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "ä¸æ”¯æŒä»Ž %s 转æ¢ä¸º %s\n" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "出现ä¸å®Œæ•´æˆ–无效的多字节åºåˆ—\n" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "无法处ç†çš„错误 %d\n" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "locale_to_utf8: locale 未设定\n" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "idn_encode 错误 (%d): %s\n" -#: src/iri.c:289 +#: src/iri.c:288 #, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "无法转为å°å†™ï¼š%d：%s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, c-format msgid "" "\n" @@ -1474,17 +1452,17 @@ msgstr "" "\n" "正在把输出é‡å®šå‘至 %s。\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s：%sï¼›ç¦ç”¨æ—¥å¿—记录。\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "用法： %s [选项]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1492,86 +1470,86 @@ msgstr "" "长选项所必须的å‚数在使用短选项时也是必须的。\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "å¯åŠ¨ï¼š\n" -#: src/main.c:573 +#: src/main.c:582 msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version 显示 Wget 的版本信æ¯å¹¶é€€å‡º\n" -#: src/main.c:575 +#: src/main.c:584 msgid " -h, --help print this help\n" msgstr " -h, --help 打å°æ­¤å¸®åŠ©\n" -#: src/main.c:577 +#: src/main.c:586 msgid " -b, --background go to background after startup\n" msgstr " -b, --background å¯åŠ¨åŽè½¬å…¥åŽå°\n" -#: src/main.c:579 +#: src/main.c:588 msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=命令 è¿è¡Œä¸€ä¸ªâ€œ.wgetrcâ€é£Žæ ¼çš„命令\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "日志和输入文件：\n" -#: src/main.c:585 +#: src/main.c:594 msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=文件 将日志信æ¯å†™å…¥ FILE\n" -#: src/main.c:587 +#: src/main.c:596 msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=文件 将信æ¯æ·»åŠ è‡³ FILE\n" -#: src/main.c:590 +#: src/main.c:599 msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug 打å°å¤§é‡è°ƒè¯•ä¿¡æ¯\n" -#: src/main.c:594 +#: src/main.c:603 msgid " --wdebug print Watt-32 debug output\n" msgstr " --wdebug æ‰“å° Watt-32 调试信æ¯\n" -#: src/main.c:597 +#: src/main.c:606 msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet 安é™æ¨¡å¼ (æ— ä¿¡æ¯è¾“出)\n" -#: src/main.c:599 +#: src/main.c:608 msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose 详尽的输出 (此为默认值)\n" -#: src/main.c:601 +#: src/main.c:610 msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --no-verbose 关闭详尽输出，但ä¸è¿›å…¥å®‰é™æ¨¡å¼\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" " --report-speed=类型 以 <类型> 报告带宽。类型å¯ä»¥æ˜¯ bits\n" -#: src/main.c:605 +#: src/main.c:614 msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=文件 下载本地或外部 <文件> 中的 URL\n" -#: src/main.c:608 +#: src/main.c:617 msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr " --input-metalink=文件 下载本地 Metalink <文件> 中的文件\n" -#: src/main.c:611 +#: src/main.c:620 msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html æŠŠè¾“å…¥æ–‡ä»¶å½“æˆ HTML 文件\n" -#: src/main.c:613 +#: src/main.c:622 msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" " relative to URL\n" @@ -1579,82 +1557,82 @@ msgstr "" " -B, --base=URL 解æžç›¸å¯¹äºŽ URL çš„ HTML 输入文件链接 (-i -" "F)\n" -#: src/main.c:616 +#: src/main.c:625 msgid " --config=FILE specify config file to use\n" msgstr " --config=文件 指定è¦ä½¿ç”¨çš„é…置文件\n" -#: src/main.c:618 +#: src/main.c:627 msgid " --no-config do not read any config file\n" msgstr " --no-cookies ä¸è¯»å–任何é…置文件\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr " --rejected-log=文件 å°†æ‹’ç» URL 的原因写入 <文件>。\n" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "下载：\n" -#: src/main.c:626 +#: src/main.c:635 msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr "" " -t, --tries=æ•°å­— 设置é‡è¯•æ¬¡æ•°ä¸º <æ•°å­—> (0 代表无é™åˆ¶)\n" -#: src/main.c:628 +#: src/main.c:637 msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused å³ä½¿æ‹’ç»è¿žæŽ¥ä¹Ÿæ˜¯é‡è¯•\n" -#: src/main.c:630 +#: src/main.c:639 msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O, --output-document=文件 将文档写入 FILE\n" -#: src/main.c:632 +#: src/main.c:641 msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr " -nc, --no-clobber ä¸è¦ä¸‹è½½å·²å­˜åœ¨å°†è¢«è¦†ç›–的文件\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" msgstr " --no-cookies ä¸è¯»å–任何é…置文件\n" -#: src/main.c:637 +#: src/main.c:646 msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue 断点续传下载文件\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr " --start-pos=åç§»é‡ ä»Žç”±é›¶è®¡æ•°çš„ <å移é‡> 开始下载\n" -#: src/main.c:641 +#: src/main.c:650 msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=类型 选择进度æ¡ç±»åž‹\n" -#: src/main.c:643 +#: src/main.c:652 msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --show-progress 在任æ„啰嗦状æ€ä¸‹éƒ½æ˜¾ç¤ºè¿›åº¦æ¡\n" -#: src/main.c:645 +#: src/main.c:654 msgid "" " -N, --timestamping don't re-retrieve files unless newer " "than\n" " local\n" msgstr " -N, --timestamping åªèŽ·å–比本地文件新的文件\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" @@ -1663,32 +1641,33 @@ msgstr "" " --no-if-modified-since ä¸è¦åœ¨æ—¶é—´æˆ³ (timestamping) 模å¼ä¸‹ä½¿ç”¨\n" " if-modified-since get æ¡ä»¶è¯·æ±‚\n" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -" --no-use-server-timestamps ä¸ç”¨æœåŠ¡å™¨ä¸Šçš„时间戳æ¥è®¾ç½®æœ¬åœ°æ–‡ä»¶\n" +" --no-use-server-timestamps ä¸ç”¨æœåŠ¡å™¨ä¸Šçš„时间戳æ¥è®¾ç½®æœ¬åœ°æ–‡ä»¶\n" -#: src/main.c:654 +#: src/main.c:663 msgid " -S, --server-response print server response\n" msgstr " -S, --server-response 打å°æœåŠ¡å™¨å“应\n" -#: src/main.c:656 +#: src/main.c:665 msgid " --spider don't download anything\n" msgstr " --spider ä¸ä¸‹è½½ä»»ä½•æ–‡ä»¶\n" -#: src/main.c:658 +#: src/main.c:667 msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=SECONDS 将所有超时设为 SECONDS 秒\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" +" --dns-servers=åœ°å€ æŒ‡å®šè¯·æ±‚çš„ DNS æœåŠ¡å™¨åˆ—表（逗å·åˆ†éš”）\n" -#: src/main.c:663 +#: src/main.c:672 msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " "IP) on local host\n" @@ -1696,30 +1675,30 @@ msgstr "" " --bind-dns-address=åœ°å€ å°† DNS 解æžå™¨ç»‘定至本地主机上的<地å€> (主" "机å或 IP)\n" -#: src/main.c:666 +#: src/main.c:675 msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=SECS 设置 DNS 查寻超时为 SECS 秒\n" -#: src/main.c:668 +#: src/main.c:677 msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=SECS 设置连接超时为 SECS 秒\n" -#: src/main.c:670 +#: src/main.c:679 msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=SECS 设置读å–超时为 SECS 秒\n" -#: src/main.c:672 +#: src/main.c:681 msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=SECONDS 等待间隔为 SECONDS 秒\n" -#: src/main.c:674 +#: src/main.c:683 msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " "retrieval\n" msgstr "" " --waitretry=SECONDS 在获å–文件的é‡è¯•æœŸé—´ç­‰å¾… 1..SECONDS 秒\n" -#: src/main.c:676 +#: src/main.c:685 msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" @@ -1727,15 +1706,15 @@ msgstr "" " --random-wait 获å–多个文件时，æ¯æ¬¡éšæœºç­‰å¾…é—´éš” " "(0.5~1.5)*WAIT 秒\n" -#: src/main.c:678 +#: src/main.c:687 msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†\n" -#: src/main.c:680 +#: src/main.c:689 msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=æ•°å­— 设置获å–é…é¢ä¸º <æ•°å­—> 字节\n" -#: src/main.c:682 +#: src/main.c:691 msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " "host\n" @@ -1743,36 +1722,36 @@ msgstr "" " --bind-address=ADDRESS 绑定至本地主机上的 ADDRESS (主机å或是 " "IP)\n" -#: src/main.c:684 +#: src/main.c:693 msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=RATE é™åˆ¶ä¸‹è½½é€ŸçŽ‡ä¸º RATE\n" -#: src/main.c:686 +#: src/main.c:695 msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache 关闭 DNS 查询缓存\n" -#: src/main.c:688 +#: src/main.c:697 msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " "allows\n" msgstr "" " --restrict-file-names=系统 é™å®šæ–‡ä»¶å中的字符为 <系统> å…许的字符\n" -#: src/main.c:690 +#: src/main.c:699 msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr " --ignore-case 匹é…文件/目录时忽略大å°å†™\n" -#: src/main.c:693 +#: src/main.c:702 msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only 仅连接至 IPv4 地å€\n" -#: src/main.c:695 +#: src/main.c:704 msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only 仅连接至 IPv6 地å€\n" -#: src/main.c:697 +#: src/main.c:706 msgid "" " --prefer-family=FAMILY connect first to addresses of specified " "family,\n" @@ -1781,22 +1760,22 @@ msgstr "" " --prefer-family=地å€æ— 首先连接至指定家æ—（IPv6，IPv4 或 none）的" "地å€\n" -#: src/main.c:701 +#: src/main.c:710 msgid " --user=USER set both ftp and http user to USER\n" msgstr "" " --user=用户 å°† ftp å’Œ http 的用户åå‡è®¾ç½®ä¸º <用户>\n" -#: src/main.c:703 +#: src/main.c:712 msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr "" " --password=å¯†ç  å°† ftp å’Œ http 的密ç å‡è®¾ç½®ä¸º <密ç >\n" -#: src/main.c:705 +#: src/main.c:714 msgid " --ask-password prompt for passwords\n" msgstr " --ask-password æ示输入密ç \n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1806,208 +1785,214 @@ msgid "" "SSH_ASKPASS \n" " environment variable is used.\n" msgstr "" +" --use-askpass=命令 指定用于请求用户å和密ç çš„凭æ®ç®¡ç†å™¨ã€‚\n" +" 如果没有æ供指定命令，程åºå°†ä½¿ç”¨ " +"WGET_ASKPASS 或\n" +" SSH_ASKPASS 环境å˜é‡ã€‚\n" -#: src/main.c:712 +#: src/main.c:721 msgid " --no-iri turn off IRI support\n" msgstr " --no-iri 关闭 IRI 支æŒ\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" " --local-encoding=ENC 使用 ENC 作为 IRI (国际化资æºæ ‡è¯†ç¬¦) 的本" "地编ç \n" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr " --remote-encoding=ENC 使用 ENC 作为默认远程编ç \n" -#: src/main.c:718 +#: src/main.c:727 msgid " --unlink remove file before clobber\n" msgstr " --unlink 覆盖å‰ç§»é™¤æ–‡ä»¶\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" +" --keep-badhash ä¿ç•™æ ¡éªŒå’Œä¸æ­£ç¡®çš„文件（附加åŽç¼€ ." +"badhash）\n" -#: src/main.c:723 +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" " --metalink-over-http 使用æ¥è‡ª HTTP å“应头的 Metalink 元数æ®\n" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr " --preferred-location Metalink 资æºçš„首选ä½ç½®\n" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr " --no-xattr ä¸è¦åœ¨æ–‡ä»¶çš„拓展属性中储存元数æ®\n" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "目录：\n" -#: src/main.c:738 +#: src/main.c:747 msgid " -nd, --no-directories don't create directories\n" msgstr " -nd, --no-directories ä¸åˆ›å»ºç›®å½•\n" -#: src/main.c:740 +#: src/main.c:749 msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories 强制创建目录\n" -#: src/main.c:742 +#: src/main.c:751 msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ä¸è¦åˆ›å»ºä¸» (host) 目录\n" -#: src/main.c:744 +#: src/main.c:753 msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories 在目录中使用åè®®å称\n" -#: src/main.c:746 +#: src/main.c:755 msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=å‰ç¼€ ä¿å­˜æ–‡ä»¶åˆ° <å‰ç¼€>/..\n" -#: src/main.c:748 +#: src/main.c:757 msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=æ•°å­— 忽略远程目录中 <æ•°å­—> 个目录层。\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP 选项：\n" -#: src/main.c:754 +#: src/main.c:763 msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=用户 设置 http 用户å为 <用户>\n" -#: src/main.c:756 +#: src/main.c:765 msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-password=å¯†ç  è®¾ç½® http 密ç ä¸º <密ç >\n" -#: src/main.c:758 +#: src/main.c:767 msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache ä¸ä½¿ç”¨æœåŠ¡å™¨ç¼“存的数æ®ã€‚\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr " --default-page=NAME 改å˜é»˜è®¤é¡µ (通常是“index.htmlâ€)。\n" -#: src/main.c:763 +#: src/main.c:772 msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr " -E, --adjust-extension 以åˆé€‚的扩展åä¿å­˜ HTML/CSS 文档\n" -#: src/main.c:765 +#: src/main.c:774 msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length 忽略头部的‘Content-Length’区域\n" -#: src/main.c:767 +#: src/main.c:776 msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=字符串 在头部æ’å…¥ <字符串>\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=类型 选择进度æ¡ç±»åž‹\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr " --max-redirect æ¯é¡µæ‰€å…许的最大é‡å®šå‘\n" -#: src/main.c:775 +#: src/main.c:784 msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=用户 使用 <用户> 作为代ç†ç”¨æˆ·å\n" -#: src/main.c:777 +#: src/main.c:786 msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=å¯†ç  ä½¿ç”¨ <密ç > 作为代ç†å¯†ç \n" -#: src/main.c:779 +#: src/main.c:788 msgid "" " --referer=URL include 'Referer: URL' header in HTTP " "request\n" msgstr " --referer=URL 在 HTTP 请求头包å«â€˜Referer: URL’\n" -#: src/main.c:781 +#: src/main.c:790 msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers å°† HTTP 头ä¿å­˜è‡³æ–‡ä»¶ã€‚\n" -#: src/main.c:783 +#: src/main.c:792 msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr "" " -U, --user-agent=ä»£ç† æ ‡è¯†è‡ªå·±ä¸º <代ç†> 而ä¸æ˜¯ Wget/VERSION。\n" -#: src/main.c:785 +#: src/main.c:794 msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr " --no-http-keep-alive ç¦ç”¨ HTTP keep-alive (æŒä¹…连接)。\n" -#: src/main.c:787 +#: src/main.c:796 msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookies。\n" -#: src/main.c:789 +#: src/main.c:798 msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr "" " --load-cookies=文件 会è¯å¼€å§‹å‰ä»Ž <文件> 中载入 cookies。\n" -#: src/main.c:791 +#: src/main.c:800 msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=文件 会è¯ç»“æŸåŽä¿å­˜ cookies 至 FILE。\n" -#: src/main.c:793 +#: src/main.c:802 msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --keep-session-cookies 载入并ä¿å­˜ä¼šè¯ (éžæ°¸ä¹…) cookies。\n" -#: src/main.c:795 +#: src/main.c:804 msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr "" " --post-data=字符串 使用 POST æ–¹å¼ï¼›æŠŠ <字串>作为数æ®å‘é€ã€‚\n" -#: src/main.c:797 +#: src/main.c:806 msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr "" " --post-file=文件 使用 POST æ–¹å¼ï¼›å‘é€ <文件> 内容。\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr " --method=HTTP方法 在请求中使用指定的 。\n" -#: src/main.c:801 +#: src/main.c:810 msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" @@ -2015,14 +2000,14 @@ msgstr "" " --post-data=字符串 把 <字串> 作为数æ®å‘é€ï¼Œå¿…须设置 --" "method\n" -#: src/main.c:803 +#: src/main.c:812 msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr "" " --post-file=文件 å‘é€ <文件> 内容，必须设置 --method\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2033,13 +2018,13 @@ msgstr "" "Disposition\n" " 头部 (实验中)。\n" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr " --content-on-error 在æœåŠ¡å™¨é”™è¯¯æ—¶è¾“出接收到的内容\n" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2049,11 +2034,11 @@ msgstr "" " --auth-no-challenge ä¸å…ˆç­‰å¾…æœåŠ¡å™¨è¯¢é—®å°±å‘é€åŸºæœ¬ HTTP 验è¯ä¿¡" "æ¯ã€‚\n" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) 选项：\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2063,47 +2048,47 @@ msgstr "" " --secure-protocol=PR 选择安全å议，å¯ä»¥æ˜¯ autoã€SSLv2ã€\n" " SSLv3ã€TLSv1ã€PFS 中的一个。\n" -#: src/main.c:822 +#: src/main.c:831 msgid " --https-only only follow secure HTTPS links\n" msgstr " --https-only åªè·Ÿéšå®‰å…¨çš„ HTTPS 链接\n" -#: src/main.c:824 +#: src/main.c:833 msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate ä¸è¦éªŒè¯æœåŠ¡å™¨çš„è¯ä¹¦ã€‚\n" -#: src/main.c:826 +#: src/main.c:835 msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=文件 客户端è¯ä¹¦æ–‡ä»¶ã€‚\n" -#: src/main.c:828 +#: src/main.c:837 msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate-type=类型 客户端è¯ä¹¦ç±»åž‹ï¼ŒPEM 或 DER。\n" -#: src/main.c:830 +#: src/main.c:839 msgid " --private-key=FILE private key file\n" msgstr " --private-key=文件 ç§é’¥æ–‡ä»¶ã€‚\n" -#: src/main.c:832 +#: src/main.c:841 msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=类型 ç§é’¥æ–‡ä»¶ç±»åž‹ï¼ŒPEM 或 DER。\n" -#: src/main.c:834 +#: src/main.c:843 msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=文件 带有一组 CA è¯ä¹¦çš„文件。\n" -#: src/main.c:836 +#: src/main.c:845 msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=DIR ä¿å­˜ CA è¯ä¹¦çš„哈希列表的目录。\n" -#: src/main.c:838 +#: src/main.c:847 msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=文件 带有一组 CA è¯ä¹¦çš„文件。\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2117,7 +2102,7 @@ msgstr "" "ç ã€\n" " “sha256//†开头ã€ç”¨â€œ;â€é—´éš”\n" -#: src/main.c:846 +#: src/main.c:855 msgid "" " --random-file=FILE file with random data for seeding the SSL " "PRNG\n" @@ -2126,7 +2111,7 @@ msgstr "" "件，\n" " 应å«æœ‰éšæœºæ•°æ®\n" -#: src/main.c:850 +#: src/main.c:859 msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" @@ -2134,74 +2119,74 @@ msgstr "" " --egd-file=文件 用于命å带有éšæœºæ•°æ®çš„ EGD 套接字的文" "件。\n" -#: src/main.c:857 +#: src/main.c:866 msgid "HSTS options:\n" msgstr "HSTS 选项：\n" -#: src/main.c:859 +#: src/main.c:868 msgid " --no-hsts disable HSTS\n" msgstr " --no-hsts ç¦ç”¨ HSTS\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr " --hsts-file HSTS æ•°æ®åº“路径（将覆盖默认值）\n" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP 选项：\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" " --ftp-stmlf 对所有二进制 FTP 文件使用 Stream_LF æ ¼å¼\n" -#: src/main.c:872 +#: src/main.c:881 msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=用户 设置 ftp 用户å为 <用户>。\n" -#: src/main.c:874 +#: src/main.c:883 msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=å¯†ç  è®¾ç½® ftp 密ç ä¸º <密ç >\n" -#: src/main.c:876 +#: src/main.c:885 msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ä¸è¦åˆ é™¤â€˜.listing’文件\n" -#: src/main.c:878 +#: src/main.c:887 msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob ä¸åœ¨ FTP 文件å中使用通é…符展开\n" -#: src/main.c:880 +#: src/main.c:889 msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp ç¦ç”¨â€œpassiveâ€ä¼ è¾“模å¼\n" -#: src/main.c:882 +#: src/main.c:891 msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions ä¿ç•™è¿œç¨‹æ–‡ä»¶çš„æƒé™\n" -#: src/main.c:884 +#: src/main.c:893 msgid "" " --retr-symlinks when recursing, get linked-to files (not " "dir)\n" msgstr "" " --retr-symlinks 递归目录时，获å–链接的文件 (而éžç›®å½•)\n" -#: src/main.c:889 +#: src/main.c:898 msgid "FTPS options:\n" msgstr "FTPS 选项：\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr " --ftps-implicit 使用éšå¼ FTPSï¼ˆé»˜è®¤ç«¯å£ 990）\n" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" @@ -2210,14 +2195,14 @@ msgstr "" " --ftps-resume-ssl 打开数æ®è¿žæŽ¥æ—¶ç»§ç»­æŽ§åˆ¶è¿žæŽ¥ä¸­çš„ SSL/" "TLS 会è¯\n" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" " --ftps-clear-data-connection åªåŠ å¯†æŽ§åˆ¶ä¿¡é“；数æ®ä¼ è¾“使用明文\n" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" @@ -2225,68 +2210,68 @@ msgstr "" " --ftps-fallback-to-ftp 回è½åˆ° FTP，如果目标æœåŠ¡å™¨ä¸æ”¯æŒ " "FTPS\n" -#: src/main.c:902 +#: src/main.c:911 msgid "WARC options:\n" msgstr "WARC 选项：\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" " --warc-file=文件å 在一个 .warc.gz 文件里ä¿æŒè¯·æ±‚/å“应数æ®\n" -#: src/main.c:906 +#: src/main.c:915 msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --warc-header=字符串 在头部æ’å…¥ <字符串>\n" -#: src/main.c:908 +#: src/main.c:917 msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " --warc-max-size=æ•°å­— å°† WARC 的最大尺寸设置为 <æ•°å­—>\n" -#: src/main.c:910 +#: src/main.c:919 msgid " --warc-cdx write CDX index files\n" msgstr " --warc-cdx 写入 CDX 索引文件\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr " --warc-dedup=文件å ä¸è¦è®°å½•åˆ—在此 CDX 文件内的记录\n" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr " --no-warc-compression ä¸è¦ GZIP 压缩 WARC 文件\n" -#: src/main.c:918 +#: src/main.c:927 msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-warc-digests ä¸è¦è®¡ç®— SHA1 摘è¦\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr " --no-warc-keep-log ä¸è¦åœ¨ WARC 记录中存储日志文件\n" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr " --warc-tempdir=目录 WARC 写入器的临时文件目录\n" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "递归下载：\n" -#: src/main.c:929 +#: src/main.c:938 msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive 指定递归下载\n" -#: src/main.c:931 +#: src/main.c:940 msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" @@ -2294,22 +2279,22 @@ msgstr "" " -l, --level=æ•°å­— 最大递归深度 (inf 或 0 代表无é™åˆ¶ï¼Œå³å…¨éƒ¨" "下载)。\n" -#: src/main.c:933 +#: src/main.c:942 msgid "" " --delete-after delete files locally after downloading " "them\n" -msgstr " --delete-after 下载完æˆåŽåˆ é™¤æœ¬åœ°æ–‡ä»¶\n" +msgstr " --delete-after 下载完æˆåŽåˆ é™¤æœ¬åœ°æ–‡ä»¶\n" -#: src/main.c:935 +#: src/main.c:944 msgid "" " -k, --convert-links make links in downloaded HTML or CSS " "point to\n" " local files\n" msgstr "" -" -k, --convert-links 让下载得到的 HTML 或 CSS 中的链接指å‘本地文" -"件\n" +" -k, --convert-links 让下载得到的 HTML 或 CSS 中的链接指å‘本地" +"文件\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" @@ -2317,121 +2302,122 @@ msgstr "" " --convert-file-only åªè½¬æ¢ URL 的文件部分（一般å«åšâ€œåŸºç¡€åâ€/" "basename）\n" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" " --backups=N 写入文件 X å‰ï¼Œè½®æ¢ç§»åŠ¨æœ€å¤š N 个备份文件\n" -#: src/main.c:944 +#: src/main.c:953 msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr "" -" -K, --backup-converted 在转æ¢æ–‡ä»¶ X å‰å…ˆå°†å®ƒå¤‡ä»½ä¸º X_orig。\n" +" -K, --backup-converted 在转æ¢æ–‡ä»¶ X å‰å…ˆå°†å®ƒå¤‡ä»½ä¸º X_orig。\n" -#: src/main.c:947 +#: src/main.c:956 msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr "" -" -K, --backup-converted 在转æ¢æ–‡ä»¶ X å‰å…ˆå°†å®ƒå¤‡ä»½ä¸º X.orig。\n" +" -K, --backup-converted 在转æ¢æ–‡ä»¶ X å‰å…ˆå°†å®ƒå¤‡ä»½ä¸º X.orig。\n" -#: src/main.c:950 +#: src/main.c:959 msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" "listing\n" msgstr "" -" -m, --mirror -N -r -l inf --no-remove-listing 的缩写形" +" -m, --mirror -N -r -l inf --no-remove-listing 的缩写形" "å¼ã€‚\n" -#: src/main.c:952 +#: src/main.c:961 msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr "" -" -p, --page-requisites 下载所有用于显示 HTML 页é¢çš„图片之类的元" +" -p, --page-requisites 下载所有用于显示 HTML 页é¢çš„图片之类的元" "素。\n" -#: src/main.c:954 +#: src/main.c:963 msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" -msgstr " --strict-comments ç”¨ä¸¥æ ¼æ–¹å¼ (SGML) å¤„ç† HTML 注释。\n" +msgstr "" +" --strict-comments ç”¨ä¸¥æ ¼æ–¹å¼ (SGML) å¤„ç† HTML 注释。\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "递归接å—/æ‹’ç»ï¼š\n" -#: src/main.c:960 +#: src/main.c:969 msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=列表 逗å·åˆ†éš”çš„å¯æŽ¥å—的扩展å列表\n" -#: src/main.c:962 +#: src/main.c:971 msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=列表 逗å·åˆ†éš”çš„è¦æ‹’ç»çš„扩展å列表\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr " --accept-regex=REGEX 匹é…接å—çš„ URL 的正则表达å¼\n" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr " --reject-regex=REGEX 匹é…æ‹’ç»çš„ URL 的正则表达å¼\n" -#: src/main.c:969 +#: src/main.c:978 msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --regex-type=类型 正则类型 (posix|pcre)\n" -#: src/main.c:972 +#: src/main.c:981 msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --regex-type=类型 正则类型 (posix)\n" -#: src/main.c:975 +#: src/main.c:984 msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=列表 逗å·åˆ†éš”çš„å¯æŽ¥å—的域å列表\n" -#: src/main.c:977 +#: src/main.c:986 msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=列表 逗å·åˆ†éš”çš„è¦æ‹’ç»çš„域å列表\n" -#: src/main.c:979 +#: src/main.c:988 msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp 跟踪 HTML 文档中的 FTP 链接\n" -#: src/main.c:981 +#: src/main.c:990 msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=列表 逗å·åˆ†éš”的跟踪的 HTML 标识列表\n" -#: src/main.c:983 +#: src/main.c:992 msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " --ignore-tags=列表 逗å·åˆ†éš”的忽略的 HTML 标识列表\n" -#: src/main.c:985 +#: src/main.c:994 msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts 递归时转å‘外部主机\n" -#: src/main.c:987 +#: src/main.c:996 msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative 仅跟踪相对链接\n" -#: src/main.c:989 +#: src/main.c:998 msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=列表 å…许目录的列表\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" @@ -2439,81 +2425,81 @@ msgid "" msgstr "" " --trust-server-names 使用é‡å®šå‘ URL 的最åŽä¸€æ®µä½œä¸ºæœ¬åœ°æ–‡ä»¶å\n" -#: src/main.c:994 +#: src/main.c:1003 msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=列表 排除目录的列表\n" -#: src/main.c:996 +#: src/main.c:1005 msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ä¸è¿½æº¯è‡³çˆ¶ç›®å½•\n" -#: src/main.c:999 +#: src/main.c:1008 msgid "Mail bug reports and suggestions to \n" msgstr "请将错误报告或建议寄给 \n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s，éžäº¤äº’å¼çš„网络文件下载工具。\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "用户 %s 的密ç : " -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "密ç : " -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "无法创建管é“\n" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" -msgstr "" +msgstr "读å–命令“%s %sâ€çš„å“应时出错：%s\n" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "“%s%sâ€çš„用户å：" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "%s%s@%s 的密ç ï¼š" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "Wgetrc: " -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "语区: " -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "编译: " -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "链接: " -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" @@ -2522,29 +2508,29 @@ msgstr "" "GNU Wget %s 在 %s 上编译。\n" "\n" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr " %s (环境)\n" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr " %s (用户)\n" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr " %s (系统)\n" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "Copyright © %s Free Software Foundation, Inc.\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2558,7 +2544,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2566,36 +2552,36 @@ msgstr "" "\n" "最åˆç”± Hrvoje NikÅ¡ić 编写。\n" -#: src/main.c:1302 +#: src/main.c:1311 msgid "Please send bug reports and questions to .\n" msgstr "请将错误报告或建议寄给 。\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "内存分é…问题\n" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "由于 %s 出错退出\n" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "请å°è¯•ä½¿ç”¨â€œ%s --helpâ€æŸ¥çœ‹æ›´å¤šçš„选项。\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s：éžæ³•çš„选项 -- “-n%câ€\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "未编译调试支æŒï¼Œå¿½ç•¥ --debug。\n" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " @@ -2603,29 +2589,29 @@ msgid "" msgstr "" "åŒæ—¶æŒ‡å®šäº† --no-clobber åŠ --convert-links å‚数，将使用 --convert-links\n" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "åŒæ—¶æŒ‡å®šäº† --no-clobber åŠ --convert-file-only å‚数，将åªä½¿ç”¨åŽè€…\n" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "无法åŒæ—¶ä½¿ç”¨è¯¦ç»†è¾“出模å¼å’Œå®‰é™æ¨¡å¼ã€‚\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "无法修改时间戳标记而ä¸æ›´æ”¹æœ¬åœ°æ–‡ä»¶ã€‚\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "无法åŒæ—¶æŒ‡å®š --inet4-only å’Œ --inet6-only。\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2637,7 +2623,7 @@ msgstr "" "结åˆä½¿ç”¨ã€‚å‚阅手册æ¥èŽ·å–详细信æ¯ã€‚\n" "\n" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" @@ -2647,7 +2633,7 @@ msgstr "" "会被放入您指定的那个å•ä¸€æ–‡ä»¶ã€‚\n" "\n" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" @@ -2657,54 +2643,49 @@ msgstr "" "å‚阅手册æ¥èŽ·å–详细信æ¯ã€‚\n" "\n" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "文件“%sâ€å·²ç»å­˜åœ¨ï¼›ä¸èŽ·å–。\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "WARC 输出ä¸èƒ½å’Œ --no-clobber åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "WARC 输出ä¸èƒ½å’Œæ—¶é—´æˆ³æ¨¡å¼ (timestamping) åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "WARC 输出ä¸èƒ½å’Œ --spider åŒæ—¶å·¥ä½œã€‚\n" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "WARC 输出ä¸èƒ½å’Œ --continue 或 --start-pos åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "å·²ç¦ç”¨æ‘˜è¦ï¼›WARC 去é‡å°†ä¸æŸ¥æ‰¾é‡å¤è®°å½•ã€‚\n" -#: src/main.c:1697 +#: src/main.c:1709 #, fuzzy, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "WARC 输出ä¸èƒ½å’Œ --continue 或 --start-pos åŒæ—¶å·¥ä½œï¼ŒåŽè€…将被ç¦ç”¨ã€‚\n" -#: src/main.c:1708 +#: src/main.c:1720 #, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "无法åŒæ—¶æŒ‡å®š --ask-password å’Œ --password。\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " @@ -2712,17 +2693,17 @@ msgid "" msgstr "" "ä¸æŽ¨èåŒæ—¶æŒ‡å®š --start-pos åŠ --continue å‚数；将ç¦ç”¨ --continue å‚数。\n" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s：未指定 URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "无法åŒæ—¶æŒ‡å®š --post-data å’Œ --post-file。\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " @@ -2731,7 +2712,7 @@ msgstr "" "--post-data åŠ --post-file å‚æ•°ä¸èƒ½ä¸Ž --method 一起使用。--method 期望从 --" "body-data åŠ --body-file å‚数获å–æ•°æ®\n" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" @@ -2740,23 +2721,23 @@ msgstr "" "使用 --body-data 或 --body-file å‚数时必须通过 --method=HTTPMethod 指定一个传" "输方å¼ã€‚\n" -#: src/main.c:1789 +#: src/main.c:1801 #, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "无法åŒæ—¶æŒ‡å®š --body-data å’Œ --body-file。\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "此版本ä¸æ”¯æŒ IRI\n" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "-k 或 -r åªæœ‰åœ¨è¾“出至普通文件的时候æ‰å¯ä»¥ä¸Ž -O 共用。\n" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " @@ -2764,42 +2745,42 @@ msgid "" msgstr "" "--convert-links 或 --convert-file-only åªæœ‰åœ¨è¾“出至普通文件时æ‰å¯å…±ç”¨ã€‚\n" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "未能åˆå§‹åŒ– libcares\n" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "未能åˆå§‹åŒ– c-ares ä¿¡é“\n" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "æ— æ³•è§£æž IP 地å€â€œ%sâ€\n" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "错误：未能设置 DNS æœåŠ¡å™¨â€œ%sâ€ï¼ˆ%d）。\n" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "在 %s 中找ä¸åˆ° URL。\n" -#: src/main.c:2152 +#: src/main.c:2161 #, c-format msgid "Unable to parse metalink file %s.\n" msgstr "æ— æ³•è§£æž metalink 文件 %s。\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "无法从 %s 下载所有资æºã€‚\n" -#: src/main.c:2209 +#: src/main.c:2218 #, c-format msgid "" "FINISHED --%s--\n" @@ -2810,7 +2791,7 @@ msgstr "" "总用时：%2$s\n" "下载了：%3$d 个文件，%5$s (%6$s) 中的 %4$s\n" -#: src/main.c:2223 +#: src/main.c:2232 #, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "超过下载é™é¢ (%s 字节)ï¼\n" @@ -2822,7 +2803,7 @@ msgstr "-O ä¸å¯ç”¨äºŽ metalink 下载。忽略此å‚数。\n" #: src/metalink.c:172 #, c-format msgid "[--trust-server-names %s, --directory-prefix=%s]\n" -msgstr "" +msgstr "[--trust-server-names %s, --directory-prefix=%s]\n" #: src/metalink.c:176 #, fuzzy, c-format @@ -2836,7 +2817,7 @@ msgstr "æ— æ³•è§£æž metalink 文件 %s。\n" #: src/metalink.c:184 msgid "Rejecting metalink file. Unsafe name.\n" -msgstr "" +msgstr "æ‹’ç» metalink 文件。ä¸å®‰å…¨çš„å称。\n" #: src/metalink.c:238 #, c-format @@ -2846,7 +2827,7 @@ msgstr "æ­£åœ¨å¤„ç† metaurl %s……\n" #: src/metalink.c:251 #, c-format msgid "Rejecting metaurl file %s. Unsafe name.\n" -msgstr "" +msgstr "æ‹’ç» metaurl 文件 %s。ä¸å®‰å…¨çš„å称。\n" #: src/metalink.c:268 #, c-format @@ -2860,7 +2841,7 @@ msgstr "æ— æ³•è§£æž metaurl 文件 %s。\n" #: src/metalink.c:354 msgid "Metaurls processing returned with error.\n" -msgstr "" +msgstr "Metaurl 处ç†è¿”回了错误。\n" #: src/metalink.c:386 #, c-format @@ -2966,104 +2947,104 @@ msgstr "已接收文件 %s，但签åä¸ç›¸ç¬¦ã€‚\n" msgid "Renaming %s to %s.\n" msgstr "正在将 %s é‡å‘½å为 %s。\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "继续在åŽå°è¿è¡Œã€‚\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "继续在åŽå°è¿è¡Œï¼Œpid 为 %lu。\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, c-format msgid "Output will be written to %s.\n" msgstr "将把输出写入至 %s。\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "fake_fork_child() 失败\n" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "fake_fork() 失败\n" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s：找ä¸åˆ°å¯ç”¨çš„ socket 驱动程åºã€‚\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "调用 ioctl() 失败。套接字ä¸å¯è®¾ä¸ºé˜»å¡žï¼ˆblocking）状æ€ã€‚\n" -#: src/netrc.c:366 +#: src/netrc.c:370 #, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s：%s:%d：警告: %s 标记出现在机器å称å‰\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s：%s:%d：未知的标记“%sâ€\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "用法：%s NETRC [主机å]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s：无法 stat %s：%s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "警告: 正在使用一个弱å£ä»¤çš„éšæœºç§å­ã€‚\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "无法 seed PRNG；考虑使用 --random-file。\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "ä½ çš„ OpenSSL 版本太è€ï¼Œä¸æ”¯æŒ TLSv1.1\n" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "ä½ çš„ OpenSSL 版本太è€ï¼Œä¸æ”¯æŒ TLSv1.2\n" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "OpenSSL：未实现‘secure-protocol’选项值 %d\n" -#: src/openssl.c:798 +#: src/openssl.c:826 #, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s: æ— æ³•éªŒè¯ %s çš„ç”± %s é¢å‘çš„è¯ä¹¦:\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr " 无法本地校验é¢å‘者的æƒé™ã€‚\n" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr " 出现了自己签åçš„è¯ä¹¦ã€‚\n" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr " é¢å‘çš„è¯ä¹¦è¿˜æœªç”Ÿæ•ˆã€‚\n" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr " é¢å‘çš„è¯ä¹¦å·²ç»è¿‡æœŸã€‚\n" -#: src/openssl.c:908 +#: src/openssl.c:936 #, c-format msgid "" "%s: no certificate subject alternative name matches\n" @@ -3072,13 +3053,13 @@ msgstr "" "%s: 没有匹é…çš„è¯ä¹¦ä¸»ä½“别å (Subject Alternative Name)。\n" "\t请求的主机å为 %s。\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr " %s: è¯ä¹¦é€šç”¨å %s 与所è¦æ±‚的主机å %s ä¸ç¬¦ã€‚\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3089,12 +3070,12 @@ msgstr "" " è¿™å¯èƒ½æ„味ç€è¯¥ä¸»æœºæ‰€å£°ç§°çš„身份与实际ä¸ç¬¦ã€‚\n" " (也就是说，它ä¸æ˜¯çœŸæ­£çš„ %s)。\n" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "è¦ä»¥ä¸å®‰å…¨çš„æ–¹å¼è¿žæŽ¥è‡³ %s，使用“--no-check-certificateâ€ã€‚\n" -#: src/progress.c:245 +#: src/progress.c:244 #, c-format msgid "" "\n" @@ -3103,28 +3084,28 @@ msgstr "" "\n" "%*s[ 跳过 %sK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "æ— æ•ˆçš„è¿›åº¦æŒ‡ç¤ºæ–¹å¼ %sï¼›ä¸ä¼šæ”¹å˜åŽŸæ¥çš„æ–¹å¼ã€‚\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr " 剩余 %s" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr " 用时 " -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "æ— æ³•èŽ·å– REALTIME 时钟频率: %s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "正在删除 %s 因为它应该被指定了拒ç»ä¸‹è½½ã€‚\n" @@ -3138,22 +3119,22 @@ msgstr "无法打开 %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "正在载入 robots.txt；请忽略错误消æ¯ã€‚\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "解æžä»£ç†æœåŠ¡å™¨ URL %s æ—¶å‘生错误：%s。\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†æœåŠ¡å™¨ URL %s 错误：必须是 HTTP。\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "已超过 %d 次é‡å®šå‘。\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3161,7 +3142,7 @@ msgstr "" "放弃æ“作。\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3169,125 +3150,125 @@ msgstr "" "é‡è¯•ä¸­ã€‚\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "没有错误" -#: src/url.c:678 +#: src/url.c:676 #, c-format msgid "Unsupported scheme %s" msgstr "ä¸æ”¯æŒçš„å议类型 %s" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "地å€ç¼ºå°‘å议类型" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "无效的主机å" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "端å£å·é”™è¯¯" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "无效的用户å" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "未结æŸçš„ IPv6 数字地å€" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "ä¸æ”¯æŒ IPv6 地å€" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "无效的 IPv6 数字地å€" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "未将 HTTPS 支æŒç¼–译到程åºä¸­" -#: src/url.c:1603 +#: src/url.c:1601 #, fuzzy msgid "Unconvertable multibyte sequence encountered\n" msgstr "出现ä¸å®Œæ•´æˆ–无效的多字节åºåˆ—\n" -#: src/utils.c:130 +#: src/utils.c:125 #, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s: %s: 无法分é…足够内存；内存耗尽。\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s: %s: æ— æ³•åˆ†é… %ld 字节；内存耗尽。\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "%s: aprintf: 文本缓冲区太大 (%d 字节)，退出。\n" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "继续在åŽå°è¿è¡Œï¼Œpid 为 %d。\n" -#: src/utils.c:584 +#: src/utils.c:579 #, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "无法删除符å·é“¾æŽ¥ %s: %s\n" -#: src/utils.c:884 +#: src/utils.c:879 #, fuzzy, c-format msgid "Failed to Fopen file %s\n" msgstr "未能åˆå§‹åŒ– libcares\n" -#: src/utils.c:890 +#: src/utils.c:885 #, fuzzy, c-format msgid "Failed to get FD for file %s\n" msgstr "无法设定 %s çš„æƒé™\n" -#: src/utils.c:897 +#: src/utils.c:892 #, fuzzy, c-format msgid "Failed to stat file %s, (check permissions)\n" msgstr "无法设定 %s çš„æƒé™\n" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 +#: src/utils.c:937 #, fuzzy, c-format msgid "Failed to open file %s, reason :%s\n" msgstr "æ— æ³•è§£æž IP 地å€â€œ%sâ€\n" -#: src/utils.c:948 +#: src/utils.c:943 #, fuzzy, c-format msgid "Failed to stat file %s, error: %s\n" msgstr "无法设定 %s çš„æƒé™\n" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "æ— æ•ˆçš„æ­£åˆ™è¡¨è¾¾å¼ %s, %s\n" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, c-format msgid "Error while matching %s: %d\n" msgstr "åŒ¹é… %s 出错: %d\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3367,6 +3348,24 @@ msgstr "无法打开临时 WARC 文件。\n" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "从 CDX 文件å‘现了精确匹é…。正将é‡è®¿é—®è®°å½•ä¿å­˜åˆ° WARC。\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s：选项“--%sâ€ä¸å…许有å‚æ•°\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s：无法识别的选项“--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s：选项“-W %sâ€ä¸æ˜Žç¡®\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s：选项“-W %sâ€ä¸å…许有å‚æ•°\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s：选项“%sâ€éœ€è¦å‚æ•°\n" + +#~ msgid "File `%s' already there; not retrieving.\n" +#~ msgstr "文件“%sâ€å·²ç»å­˜åœ¨ï¼›ä¸èŽ·å–。\n" + #~ msgid "" #~ "Found no broken links.\n" #~ "\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 5998401..7bb5610 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 7e64eab..6bc3a18 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: wget 1.10.1-b1\n" "Report-Msgid-Bugs-To: bug-wget@gnu.org\n" -"POT-Creation-Date: 2017-10-26 17:36+0200\n" +"POT-Creation-Date: 2018-01-19 19:53+0100\n" "PO-Revision-Date: 2005-08-17 13:30+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/error.c:191 +#: lib/error.c:195 #, fuzzy msgid "Unknown system error" msgstr "錯誤原因ä¸æ˜Ž" @@ -29,7 +29,7 @@ msgstr "錯誤原因ä¸æ˜Ž" msgid "Address family for hostname not supported" msgstr "ä¸æ”¯æ´ IPv6 ä½å€" -#: lib/gai_strerror.c:58 src/host.c:373 +#: lib/gai_strerror.c:58 src/host.c:371 msgid "Temporary failure in name resolution" msgstr "暫時無法檢索主機å稱" @@ -100,70 +100,45 @@ msgstr "" msgid "Parameter string not correctly encoded" msgstr "" -#: lib/gai_strerror.c:87 src/host.c:375 +#: lib/gai_strerror.c:87 src/host.c:373 msgid "Unknown error" msgstr "錯誤原因ä¸æ˜Ž" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: é¸é …‘%s’ä¸æ˜Žç¢º\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: é¸é …‘%s’ä¸æ˜Žç¢º\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: é¸é …‘--%s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: 無法識別é¸é …‘%c%s’\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: é¸é …‘%c%s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: é¸é …‘%s’需è¦å¼•æ•¸\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: 無法識別é¸é …‘--%s’\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: 無法識別é¸é …‘%c%s’\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: é¸é …無效 ─ %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: é¸é …需è¦å¼•æ•¸ ─ %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: é¸é …‘-W %s’ä¸æ˜Žç¢º\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: é¸é …‘-W %s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: é¸é …‘%s’需è¦å¼•æ•¸\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -183,13 +158,13 @@ msgstr "%s: é¸é …‘%s’需è¦å¼•æ•¸\n" #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:354 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:355 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -264,28 +239,28 @@ msgstr "" msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:687 +#: lib/regcomp.c:689 msgid "No previous regular expression" msgstr "" -#: lib/spawn-pipe.c:137 lib/spawn-pipe.c:140 lib/spawn-pipe.c:261 -#: lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:142 lib/spawn-pipe.c:145 lib/spawn-pipe.c:266 +#: lib/spawn-pipe.c:269 #, c-format msgid "cannot create pipe" msgstr "" -#: lib/spawn-pipe.c:231 lib/spawn-pipe.c:345 lib/wait-process.c:282 +#: lib/spawn-pipe.c:236 lib/spawn-pipe.c:350 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/w32spawn.h:45 +#: lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "" -#: lib/w32spawn.h:86 +#: lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "" @@ -304,51 +279,51 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: src/connect.c:202 +#: src/connect.c:200 #, fuzzy, c-format msgid "%s: unable to resolve bind address %s; disabling bind.\n" msgstr "%s: 無法解æžä½å€ ‘%s’；ä¸ä½¿ç”¨ bind。\n" -#: src/connect.c:283 +#: src/connect.c:281 #, c-format msgid "Connecting to %s|%s|:%d... " msgstr "正在連接 %s|%s|:%d... " -#: src/connect.c:291 +#: src/connect.c:289 #, c-format msgid "Connecting to %s:%d... " msgstr "正在連接 %s:%d... " -#: src/connect.c:294 +#: src/connect.c:292 #, fuzzy, c-format msgid "Connecting to [%s]:%d... " msgstr "正在連接 %s:%d... " -#: src/connect.c:330 +#: src/connect.c:328 #, c-format msgid "setsockopt SO_RCVBUF failed: %s\n" msgstr "" -#: src/connect.c:358 +#: src/connect.c:356 msgid "connected.\n" msgstr "連上了。\n" -#: src/connect.c:377 src/host.c:914 src/host.c:952 +#: src/connect.c:375 src/host.c:912 src/host.c:950 #, c-format msgid "failed: %s.\n" msgstr "失敗: %s。\n" -#: src/connect.c:401 src/http.c:2096 +#: src/connect.c:399 src/http.c:2097 #, fuzzy, c-format msgid "%s: unable to resolve host address %s\n" msgstr "%s: 無法解æžä½å€ ‘%s’；ä¸ä½¿ç”¨ bind。\n" -#: src/connect.c:471 +#: src/connect.c:469 #, c-format msgid "setsockopt SO_REUSEADDR failed: %s\n" msgstr "" -#: src/connect.c:692 src/connect.c:739 +#: src/connect.c:690 src/connect.c:737 #, c-format msgid "Too many fds open. Cannot use select on a fd >= %d\n" msgstr "" @@ -382,174 +357,174 @@ msgstr "無法刪除‘%s’: %s\n" msgid "Cannot back up %s as %s: %s\n" msgstr "無法將 %s å‚™ä»½æˆ %s: %s\n" -#: src/cookies.c:311 +#: src/cookies.c:310 #, fuzzy, c-format msgid "Unable to get cookie for %s\n" msgstr "無法刪除‘%s’: %s\n" -#: src/cookies.c:458 +#: src/cookies.c:457 #, c-format msgid "Syntax error in Set-Cookie: %s at position %d.\n" msgstr "Set-Cookie 出ç¾èªžæ³•éŒ¯èª¤: 在 %2$d ä½ç½®çš„ %1$s。\n" -#: src/cookies.c:772 +#: src/cookies.c:771 #, fuzzy, c-format msgid "Cookie coming from %s attempted to set domain to " msgstr "來自 %s çš„ cookie 嘗試將網域設定為 %s\n" -#: src/cookies.c:775 +#: src/cookies.c:774 #, c-format msgid "%s\n" msgstr "" -#: src/cookies.c:1226 src/cookies.c:1347 +#: src/cookies.c:1225 src/cookies.c:1346 #, fuzzy, c-format msgid "Cannot open cookies file %s: %s\n" msgstr "無法開啟 cookie 檔‘%s’: %s\n" -#: src/cookies.c:1384 +#: src/cookies.c:1383 #, fuzzy, c-format msgid "Error writing to %s: %s\n" msgstr "寫入‘%s’時發生錯誤: %s\n" -#: src/cookies.c:1387 +#: src/cookies.c:1386 #, fuzzy, c-format msgid "Error closing %s: %s\n" msgstr "關閉‘%s’時發生錯誤: %s\n" -#: src/ftp-ls.c:1051 +#: src/ftp-ls.c:1049 msgid "Unsupported listing type, trying Unix listing parser.\n" msgstr "使用了ä¸æ”¯æ´çš„檔案清單類型，å‡è¨­æ˜¯ Unix æ ¼å¼çš„清單來分æžã€‚\n" -#: src/ftp-ls.c:1102 src/ftp-ls.c:1104 +#: src/ftp-ls.c:1100 src/ftp-ls.c:1102 #, c-format msgid "Index of /%s on %s:%d" msgstr "/%s 的索引，在 %s:%d" -#: src/ftp-ls.c:1129 +#: src/ftp-ls.c:1127 #, c-format msgid "time unknown " msgstr "時間ä¸è©³ " -#: src/ftp-ls.c:1133 +#: src/ftp-ls.c:1131 #, c-format msgid "File " msgstr "檔案 " -#: src/ftp-ls.c:1136 +#: src/ftp-ls.c:1134 #, c-format msgid "Directory " msgstr "目錄 " -#: src/ftp-ls.c:1139 +#: src/ftp-ls.c:1137 #, c-format msgid "Link " msgstr "éˆçµ " -#: src/ftp-ls.c:1142 +#: src/ftp-ls.c:1140 #, c-format msgid "Not sure " msgstr "無法確定 " -#: src/ftp-ls.c:1165 +#: src/ftp-ls.c:1163 #, c-format msgid " (%s bytes)" msgstr " (%s ä½å…ƒçµ„)" -#: src/ftp.c:226 +#: src/ftp.c:225 #, c-format msgid "Length: %s" msgstr "長度: %s" -#: src/ftp.c:232 src/http.c:4003 +#: src/ftp.c:231 src/http.c:4028 #, c-format msgid ", %s (%s) remaining" msgstr "，剩餘 %s (%s)" -#: src/ftp.c:236 src/http.c:4007 +#: src/ftp.c:235 src/http.c:4032 #, c-format msgid ", %s remaining" msgstr "，剩餘 %s" -#: src/ftp.c:239 +#: src/ftp.c:238 msgid " (unauthoritative)\n" msgstr " (éžæ­£å¼è³‡æ–™)\n" -#: src/ftp.c:404 +#: src/ftp.c:403 msgid "Could not initialize SSL. It will be disabled." msgstr "" -#: src/ftp.c:486 +#: src/ftp.c:485 #, c-format msgid "Logging in as %s ... " msgstr "以 %s 的身分登入... " -#: src/ftp.c:505 src/ftp.c:591 src/ftp.c:658 src/ftp.c:723 src/ftp.c:957 -#: src/ftp.c:1010 src/ftp.c:1057 src/ftp.c:1120 src/ftp.c:1181 src/ftp.c:1279 -#: src/ftp.c:1329 +#: src/ftp.c:504 src/ftp.c:590 src/ftp.c:657 src/ftp.c:722 src/ftp.c:956 +#: src/ftp.c:1009 src/ftp.c:1056 src/ftp.c:1119 src/ftp.c:1180 src/ftp.c:1278 +#: src/ftp.c:1328 msgid "Error in server response, closing control connection.\n" msgstr "伺æœå™¨å›žæ‡‰è¨Šæ¯ç™¼ç”ŸéŒ¯èª¤ï¼Œæœƒé—œé–‰æŽ§åˆ¶é€£ç·šã€‚\n" -#: src/ftp.c:512 +#: src/ftp.c:511 msgid "Error in server greeting.\n" msgstr "伺æœå™¨è¨Šæ¯å‡ºç¾éŒ¯èª¤ã€‚\n" -#: src/ftp.c:519 src/ftp.c:731 src/ftp.c:965 src/ftp.c:1065 src/ftp.c:1130 -#: src/ftp.c:1191 src/ftp.c:1289 src/ftp.c:1339 +#: src/ftp.c:518 src/ftp.c:730 src/ftp.c:964 src/ftp.c:1064 src/ftp.c:1129 +#: src/ftp.c:1190 src/ftp.c:1288 src/ftp.c:1338 msgid "Write failed, closing control connection.\n" msgstr "無法寫入，會關閉控制連線。\n" -#: src/ftp.c:525 +#: src/ftp.c:524 msgid "The server refuses login.\n" msgstr "伺æœå™¨æ‹’絕登入。\n" -#: src/ftp.c:531 +#: src/ftp.c:530 msgid "Login incorrect.\n" msgstr "登入錯誤。\n" -#: src/ftp.c:537 +#: src/ftp.c:536 msgid "Logged in!\n" msgstr "登入完æˆï¼\n" -#: src/ftp.c:557 +#: src/ftp.c:556 msgid "Server did not accept the 'PBSZ 0' command.\n" msgstr "" -#: src/ftp.c:567 +#: src/ftp.c:566 #, c-format msgid "Server did not accept the 'PROT %c' command.\n" msgstr "" -#: src/ftp.c:599 +#: src/ftp.c:598 msgid "Server error, can't determine system type.\n" msgstr "伺æœå™¨éŒ¯èª¤ï¼Œç„¡æ³•æ±ºå®šä½œæ¥­ç³»çµ±çš„類型。\n" -#: src/ftp.c:608 src/ftp.c:1100 src/ftp.c:1164 src/ftp.c:1207 +#: src/ftp.c:607 src/ftp.c:1099 src/ftp.c:1163 src/ftp.c:1206 msgid "done. " msgstr "完æˆã€‚ " -#: src/ftp.c:711 src/ftp.c:983 src/ftp.c:1027 src/ftp.c:1309 src/ftp.c:1358 +#: src/ftp.c:710 src/ftp.c:982 src/ftp.c:1026 src/ftp.c:1308 src/ftp.c:1357 msgid "done.\n" msgstr "完æˆã€‚\n" -#: src/ftp.c:738 +#: src/ftp.c:737 #, c-format msgid "Unknown type `%c', closing control connection.\n" msgstr "類別 ‘%c’ ä¸è©³ï¼Œæœƒé—œé–‰æŽ§åˆ¶é€£ç·šã€‚\n" -#: src/ftp.c:750 +#: src/ftp.c:749 msgid "done. " msgstr "完æˆã€‚ " -#: src/ftp.c:756 +#: src/ftp.c:755 msgid "==> CWD not needed.\n" msgstr "==> ä¸éœ€è¦ CWD (切æ›è·¯å¾‘)。\n" -#: src/ftp.c:940 +#: src/ftp.c:939 msgid "Logically impossible section reached in getftp()" msgstr "" -#: src/ftp.c:941 +#: src/ftp.c:940 #, c-format msgid "" "cwd_count: %d\n" @@ -557,7 +532,7 @@ msgid "" "cwd_end: %d\n" msgstr "" -#: src/ftp.c:971 +#: src/ftp.c:970 #, fuzzy, c-format msgid "" "No such directory %s.\n" @@ -566,38 +541,38 @@ msgstr "" "目錄‘%s’ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:992 +#: src/ftp.c:991 msgid "==> CWD not required.\n" msgstr "==> ä¸éœ€è¦ CWD (切æ›è·¯å¾‘)。\n" -#: src/ftp.c:1035 +#: src/ftp.c:1034 #, fuzzy msgid "File has already been retrieved.\n" msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" -#: src/ftp.c:1071 +#: src/ftp.c:1070 msgid "Cannot initiate PASV transfer.\n" msgstr "無法åˆå§‹åŒ– PASV 檔案傳é€æ–¹å¼ã€‚\n" -#: src/ftp.c:1075 +#: src/ftp.c:1074 msgid "Cannot parse PASV response.\n" msgstr "ç„¡æ³•åˆ†æž PASV 回應訊æ¯ã€‚\n" -#: src/ftp.c:1092 +#: src/ftp.c:1091 #, c-format msgid "couldn't connect to %s port %d: %s\n" msgstr "無法連上 %s 的埠號 %d: %s\n" -#: src/ftp.c:1146 +#: src/ftp.c:1145 #, c-format msgid "Bind error (%s).\n" msgstr "Bind 發生錯誤(%s)。\n" -#: src/ftp.c:1152 +#: src/ftp.c:1151 msgid "Invalid PORT.\n" msgstr "PORT 指令無效。\n" -#: src/ftp.c:1198 +#: src/ftp.c:1197 msgid "" "\n" "REST failed, starting from scratch.\n" @@ -605,19 +580,19 @@ msgstr "" "\n" "é‡è¨­ (REST) 失敗，需è¦é‡æ–°é–‹å§‹å‚³é€ã€‚\n" -#: src/ftp.c:1241 +#: src/ftp.c:1240 #, c-format msgid "File %s exists.\n" msgstr "" -#: src/ftp.c:1247 +#: src/ftp.c:1246 #, fuzzy, c-format msgid "No such file %s.\n" msgstr "" "檔案‘%s’ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1297 +#: src/ftp.c:1296 #, fuzzy, c-format msgid "" "No such file %s.\n" @@ -626,7 +601,7 @@ msgstr "" "檔案‘%s’ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1347 +#: src/ftp.c:1346 #, fuzzy, c-format msgid "" "No such file or directory %s.\n" @@ -635,40 +610,40 @@ msgstr "" "檔案或目錄‘%s’ä¸å­˜åœ¨ã€‚\n" "\n" -#: src/ftp.c:1506 src/http.c:2551 +#: src/ftp.c:1505 src/http.c:2552 #, c-format msgid "%s has sprung into existence.\n" msgstr "%s çªç„¶å‡ºç¾ã€‚\n" -#: src/ftp.c:1595 +#: src/ftp.c:1594 #, c-format msgid "%s: %s, closing control connection.\n" msgstr "%s: %s，將會關閉控制連線。\n" -#: src/ftp.c:1607 +#: src/ftp.c:1606 #, c-format msgid "%s (%s) - Data connection: %s; " msgstr "%s (%s) ─ 數據連線: %sï¼›" -#: src/ftp.c:1622 +#: src/ftp.c:1621 msgid "Control connection closed.\n" msgstr "已關閉控制連線。\n" -#: src/ftp.c:1640 +#: src/ftp.c:1639 msgid "Data transfer aborted.\n" msgstr "已中止傳é€è³‡æ–™ã€‚\n" -#: src/ftp.c:1864 +#: src/ftp.c:1863 src/main.c:1649 #, fuzzy, c-format msgid "File %s already there; not retrieving.\n" msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" -#: src/ftp.c:1949 src/http.c:4273 +#: src/ftp.c:1948 src/http.c:4298 #, c-format msgid "(try:%2d)" msgstr "(嘗試第 %2d 次)" -#: src/ftp.c:2037 src/http.c:4689 +#: src/ftp.c:2036 src/http.c:4714 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s]\n" @@ -677,7 +652,7 @@ msgstr "" "%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" "\n" -#: src/ftp.c:2038 src/http.c:4690 +#: src/ftp.c:2037 src/http.c:4715 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s]\n" @@ -686,40 +661,40 @@ msgstr "" "%s (%s) - 已儲存‘%s’ [%s]\n" "\n" -#: src/ftp.c:2098 src/main.c:2117 src/metalink.c:1137 src/recur.c:513 -#: src/recur.c:748 src/retr.c:1294 +#: src/ftp.c:2097 src/main.c:2126 src/metalink.c:1137 src/recur.c:511 +#: src/recur.c:746 src/retr.c:1293 #, c-format msgid "Removing %s.\n" msgstr "刪除 %s。\n" -#: src/ftp.c:2152 +#: src/ftp.c:2151 #, fuzzy, c-format msgid "Using %s as listing tmp file.\n" msgstr "使用‘%s’作為檔案清單暫存檔。\n" -#: src/ftp.c:2169 +#: src/ftp.c:2168 #, fuzzy, c-format msgid "Removed %s.\n" msgstr "已刪除‘%s’。\n" -#: src/ftp.c:2209 +#: src/ftp.c:2208 #, c-format msgid "Recursion depth %d exceeded max. depth %d.\n" msgstr "éˆçµæ·±åº¦ %d 超éŽæœ€å¤§å€¼ %d。\n" -#: src/ftp.c:2279 +#: src/ftp.c:2278 #, fuzzy, c-format msgid "Remote file no newer than local file %s -- not retrieving.\n" msgstr "é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" -#: src/ftp.c:2287 +#: src/ftp.c:2286 #, fuzzy, c-format msgid "" "Remote file is newer than local file %s -- retrieving.\n" "\n" msgstr "é ç«¯æª”案較本機檔案‘%s’新 ─ 會下載檔案。\n" -#: src/ftp.c:2294 +#: src/ftp.c:2293 #, c-format msgid "" "The sizes do not match (local %s) -- retrieving.\n" @@ -728,11 +703,11 @@ msgstr "" "檔案大å°ä¸ç¬¦ (本機檔案為 %s) -- 下載檔案。\n" "\n" -#: src/ftp.c:2312 +#: src/ftp.c:2311 msgid "Invalid name of the symlink, skipping.\n" msgstr "ç•¥éŽå稱有誤的符號éˆçµã€‚\n" -#: src/ftp.c:2329 +#: src/ftp.c:2328 #, c-format msgid "" "Already have correct symlink %s -> %s\n" @@ -741,240 +716,240 @@ msgstr "" "正確的符號éˆçµ %s → %s 已經存在\n" "\n" -#: src/ftp.c:2338 +#: src/ftp.c:2337 #, c-format msgid "Creating symlink %s -> %s\n" msgstr "建立符號éˆçµ %s → %s\n" -#: src/ftp.c:2348 +#: src/ftp.c:2347 #, fuzzy, c-format msgid "Symlinks not supported, skipping symlink %s.\n" msgstr "本系統ä¸æ”¯æ´ç¬¦è™Ÿéˆçµï¼Œç•¥éŽç¬¦è™Ÿéˆçµâ€˜%s’。\n" -#: src/ftp.c:2363 +#: src/ftp.c:2362 #, fuzzy, c-format msgid "Skipping directory %s.\n" msgstr "ç•¥éŽç›®éŒ„‘%s’。\n" -#: src/ftp.c:2376 +#: src/ftp.c:2375 #, c-format msgid "%s: unknown/unsupported file type.\n" msgstr "%s: 檔案類別ä¸è©³æˆ–ä¸æ”¯æ´ã€‚\n" -#: src/ftp.c:2400 +#: src/ftp.c:2399 #, fuzzy, c-format msgid "Failed to set permissions for %s.\n" msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" -#: src/ftp.c:2421 +#: src/ftp.c:2420 #, c-format msgid "%s: corrupt time-stamp.\n" msgstr "%s: 時間標記錯誤。\n" -#: src/ftp.c:2445 +#: src/ftp.c:2444 #, c-format msgid "Will not retrieve dirs since depth is %d (max %d).\n" msgstr "因為深度為 %d (最大值為 %d)，所以ä¸ä¸‹è¼‰ã€‚\n" -#: src/ftp.c:2496 +#: src/ftp.c:2495 #, fuzzy, c-format msgid "Not descending to %s as it is excluded/not-included.\n" msgstr "ä¸é€²å…¥â€˜%s’目錄因為已被排除或ä¸è¢«åˆ—入清單中。\n" -#: src/ftp.c:2586 src/ftp.c:2600 +#: src/ftp.c:2585 src/ftp.c:2599 #, fuzzy, c-format msgid "Rejecting %s.\n" msgstr "拒絕‘%s’。\n" -#: src/ftp.c:2623 +#: src/ftp.c:2622 #, fuzzy, c-format msgid "Error matching %s against %s: %s\n" msgstr "寫入‘%s’時發生錯誤: %s\n" -#: src/ftp.c:2679 +#: src/ftp.c:2678 #, fuzzy, c-format msgid "No matches on pattern %s.\n" msgstr "沒有任何項目符åˆæ¨£å¼â€˜%s’。\n" -#: src/ftp.c:2751 +#: src/ftp.c:2750 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s [%s].\n" msgstr "å°‡ HTML 化的索引寫入至 ‘%s’ [%s]。\n" -#: src/ftp.c:2756 +#: src/ftp.c:2755 #, fuzzy, c-format msgid "Wrote HTML-ized index to %s.\n" msgstr "å°‡ HTML 化的索引寫入至 ‘%s’。\n" -#: src/gnutls.c:115 +#: src/gnutls.c:114 #, c-format msgid "ERROR: Cannot open directory %s.\n" msgstr "" -#: src/gnutls.c:165 +#: src/gnutls.c:164 #, c-format msgid "ERROR: Failed to open cert %s: (%d).\n" msgstr "" -#: src/gnutls.c:170 +#: src/gnutls.c:169 #, c-format msgid "Loaded CA certificate '%s'\n" msgstr "" -#: src/gnutls.c:180 +#: src/gnutls.c:179 #, c-format msgid "ERROR: Failed to load CRL file '%s': (%d)\n" msgstr "" -#: src/gnutls.c:184 +#: src/gnutls.c:183 #, c-format msgid "Loaded CRL file '%s'\n" msgstr "" -#: src/gnutls.c:208 +#: src/gnutls.c:207 msgid "ERROR: GnuTLS requires the key and the cert to be of the same type.\n" msgstr "" -#: src/gnutls.c:602 +#: src/gnutls.c:601 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %u\n" msgstr "" -#: src/gnutls.c:604 src/gnutls.c:641 src/host.c:159 src/openssl.c:255 +#: src/gnutls.c:603 src/gnutls.c:640 src/host.c:157 src/openssl.c:278 #, fuzzy msgid "Please report this issue to bug-wget@gnu.org\n" msgstr "請將錯誤報告或建議寄給 。\n" -#: src/gnutls.c:640 +#: src/gnutls.c:639 #, c-format msgid "GnuTLS: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "ERROR" msgstr "錯誤" -#: src/gnutls.c:769 src/openssl.c:763 +#: src/gnutls.c:768 src/openssl.c:791 msgid "WARNING" msgstr "警告" -#: src/gnutls.c:780 src/openssl.c:776 +#: src/gnutls.c:779 src/openssl.c:804 #, c-format msgid "%s: No certificate presented by %s.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:786 +#: src/gnutls.c:785 #, fuzzy, c-format msgid "%s: The certificate of %s is not trusted.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:787 +#: src/gnutls.c:786 #, c-format msgid "%s: The certificate of %s hasn't got a known issuer.\n" msgstr "" -#: src/gnutls.c:788 +#: src/gnutls.c:787 #, fuzzy, c-format msgid "%s: The certificate of %s has been revoked.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:789 +#: src/gnutls.c:788 #, fuzzy, c-format msgid "%s: The certificate signer of %s was not a CA.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:790 +#: src/gnutls.c:789 #, c-format msgid "%s: The certificate of %s was signed using an insecure algorithm.\n" msgstr "" -#: src/gnutls.c:791 +#: src/gnutls.c:790 #, c-format msgid "%s: The certificate of %s is not yet activated.\n" msgstr "" -#: src/gnutls.c:792 +#: src/gnutls.c:791 #, fuzzy, c-format msgid "%s: The certificate of %s has expired.\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:804 +#: src/gnutls.c:803 #, c-format msgid "Error initializing X509 certificate: %s\n" msgstr "" -#: src/gnutls.c:813 +#: src/gnutls.c:812 #, fuzzy msgid "No certificate found\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/gnutls.c:820 +#: src/gnutls.c:819 #, fuzzy, c-format msgid "Error parsing certificate: %s\n" msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" -#: src/gnutls.c:827 +#: src/gnutls.c:826 msgid "The certificate has not yet been activated\n" msgstr "" -#: src/gnutls.c:832 +#: src/gnutls.c:831 msgid "The certificate has expired\n" msgstr "" -#: src/gnutls.c:839 +#: src/gnutls.c:838 #, fuzzy, c-format msgid "The certificate's owner does not match hostname %s\n" msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" -#: src/gnutls.c:848 src/openssl.c:972 +#: src/gnutls.c:847 src/openssl.c:1000 msgid "The public key does not match pinned public key!\n" msgstr "" -#: src/gnutls.c:857 +#: src/gnutls.c:856 msgid "Certificate must be X.509\n" msgstr "" -#: src/host.c:158 +#: src/host.c:156 msgid "Error in handling the address list.\n" msgstr "" -#: src/host.c:369 +#: src/host.c:367 msgid "Unknown host" msgstr "ä¸æ˜Žä¸»æ©Ÿ" -#: src/host.c:849 +#: src/host.c:847 #, c-format msgid "Resolving %s... " msgstr "正在查找主機 %s... " -#: src/host.c:925 +#: src/host.c:923 msgid "failed: No IPv4/IPv6 addresses for host.\n" msgstr "失敗: 該主機沒有 IPv4/IPv6 地å€ã€‚\n" -#: src/host.c:955 +#: src/host.c:953 msgid "failed: timed out.\n" msgstr "失敗: 連線逾時。\n" -#: src/html-url.c:307 +#: src/html-url.c:305 #, c-format msgid "%s: Cannot resolve incomplete link %s.\n" msgstr "%s: 無法解æžä¸å®Œæ•´çš„符號éˆçµ %s。\n" -#: src/html-url.c:931 +#: src/html-url.c:929 #, c-format msgid "%s: Invalid URL %s: %s\n" msgstr "%s: URL ‘%s’ 無效: %s\n" -#: src/http.c:376 +#: src/http.c:377 #, c-format msgid "Failed writing HTTP request: %s.\n" msgstr "無法寫入 HTTP è¦æ±‚: %s。\n" -#: src/http.c:781 +#: src/http.c:782 msgid "No headers, assuming HTTP/0.9" msgstr "沒有任何標頭資料，å‡è¨­ç‚º HTTP/0.9" -#: src/http.c:1611 +#: src/http.c:1612 #, fuzzy, c-format msgid "" "File %s already there; not retrieving.\n" @@ -983,133 +958,133 @@ msgstr "" "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" "\n" -#: src/http.c:1821 +#: src/http.c:1822 msgid "gmtime failed. This is probably a bug.\n" msgstr "" -#: src/http.c:1882 +#: src/http.c:1883 msgid "" "Cannot convert timestamp to http format. Falling back to time 0 as last " "modification time.\n" msgstr "" -#: src/http.c:1986 +#: src/http.c:1987 #, fuzzy, c-format msgid "BODY data file %s missing: %s\n" msgstr "載有 POST 資料的檔案 ‘%s’ ä¸è¦‹äº†ï¼š%s\n" -#: src/http.c:2078 +#: src/http.c:2079 #, fuzzy, c-format msgid "Reusing existing connection to [%s]:%d.\n" msgstr "繼續使用和 %s:%d 的連線。\n" -#: src/http.c:2083 +#: src/http.c:2084 #, c-format msgid "Reusing existing connection to %s:%d.\n" msgstr "繼續使用和 %s:%d 的連線。\n" -#: src/http.c:2149 +#: src/http.c:2150 #, c-format msgid "Failed reading proxy response: %s\n" msgstr "無法讀å–代ç†ä¼ºæœå™¨å›žæ‡‰: %s。\n" -#: src/http.c:2168 src/http.c:3407 src/http.c:4483 +#: src/http.c:2169 src/http.c:3408 src/http.c:4508 #, c-format msgid "%s ERROR %d: %s.\n" msgstr "%s 錯誤 %d: %s。\n" -#: src/http.c:2170 src/http.c:3409 src/http.c:3597 +#: src/http.c:2171 src/http.c:3410 src/http.c:3598 msgid "Malformed status line" msgstr "ä¸æ­£å¸¸çš„狀態行" -#: src/http.c:2181 +#: src/http.c:2182 #, c-format msgid "Proxy tunneling failed: %s" msgstr "無法é€éŽä»£ç†ä¼ºæœå™¨é€²è¡Œ tunneling: %s" -#: src/http.c:2417 +#: src/http.c:2418 msgid "Unknown authentication scheme.\n" msgstr "èªè­‰æ–¹å¼ä¸è©³ã€‚\n" -#: src/http.c:2435 +#: src/http.c:2436 #, fuzzy, c-format msgid "Authentication selected: %s\n" msgstr "èªè­‰æ–¹å¼ä¸è©³ã€‚\n" -#: src/http.c:2566 +#: src/http.c:2567 #, c-format msgid "Saving to: %s\n" msgstr "" -#: src/http.c:2785 +#: src/http.c:2786 #, c-format msgid "" "When downloading signature:\n" "%s: %s.\n" msgstr "" -#: src/http.c:2821 +#: src/http.c:2822 msgid "Unable to read signature content from temporary file. Skipping.\n" msgstr "" -#: src/http.c:2844 +#: src/http.c:2845 msgid "Could not create temporary file. Skipping signature download.\n" msgstr "" -#: src/http.c:2878 src/http.c:2960 +#: src/http.c:2879 src/http.c:2961 #, c-format msgid "Invalid pri value. Assuming %d.\n" msgstr "" -#: src/http.c:3064 +#: src/http.c:3065 msgid "" "Could not find acceptable digest for Metalink resources.\n" "Ignoring them.\n" msgstr "" -#: src/http.c:3201 +#: src/http.c:3202 msgid "Disabling SSL due to encountered errors.\n" msgstr "å› é‡åˆ°éŒ¯èª¤è€Œåœæ­¢ä½¿ç”¨ SSL。\n" -#: src/http.c:3343 +#: src/http.c:3344 #, c-format msgid "%s request sent, awaiting response... " msgstr "å·²é€å‡º %s è¦æ±‚，正在等候回應... " -#: src/http.c:3383 +#: src/http.c:3384 msgid "No data received.\n" msgstr "收ä¸åˆ°è³‡æ–™ã€‚\n" -#: src/http.c:3389 +#: src/http.c:3390 #, c-format msgid "Read error (%s) in headers.\n" msgstr "讀å–標頭時發生錯誤 (%s)。\n" -#: src/http.c:3599 +#: src/http.c:3600 msgid "(no description)" msgstr "(沒有任何說明)" -#: src/http.c:3768 +#: src/http.c:3787 #, c-format msgid "Location: %s%s\n" msgstr "ä½ç½®: %s%s\n" -#: src/http.c:3769 src/http.c:4013 +#: src/http.c:3788 src/http.c:4038 msgid "unspecified" msgstr "未指定" -#: src/http.c:3770 +#: src/http.c:3789 msgid " [following]" msgstr " [跟隨至新的 URL]" -#: src/http.c:3853 +#: src/http.c:3871 #, c-format msgid "" "File %s not modified on server. Omitting download.\n" "\n" msgstr "" -#: src/http.c:3924 +#: src/http.c:3944 #, c-format msgid "" "Server ignored If-Modified-Since header for file %s.\n" @@ -1117,7 +1092,7 @@ msgid "" "\n" msgstr "" -#: src/http.c:3954 +#: src/http.c:3974 msgid "" "\n" " The file is already fully retrieved; nothing to do.\n" @@ -1127,81 +1102,81 @@ msgstr "" " 檔案早已下載完æˆï¼›ä¸æœƒé€²è¡Œä»»ä½•æ“作。\n" "\n" -#: src/http.c:3993 +#: src/http.c:4018 msgid "Length: " msgstr "長度: " -#: src/http.c:4013 +#: src/http.c:4038 msgid "ignored" msgstr "忽略" -#: src/http.c:4181 +#: src/http.c:4206 msgid "Warning: wildcards not supported in HTTP.\n" msgstr "警告: HTTP ä¸æ”¯æ´è¬ç”¨å­—元。\n" -#: src/http.c:4263 +#: src/http.c:4288 msgid "Spider mode enabled. Check if remote file exists.\n" msgstr "" -#: src/http.c:4353 +#: src/http.c:4378 #, fuzzy, c-format msgid "Cannot write to %s (%s).\n" msgstr "無法寫入‘%s’(%s)。\n" -#: src/http.c:4364 +#: src/http.c:4389 msgid "Required attribute missing from Header received.\n" msgstr "" -#: src/http.c:4369 +#: src/http.c:4394 msgid "Username/Password Authentication Failed.\n" msgstr "" -#: src/http.c:4375 +#: src/http.c:4400 #, fuzzy msgid "Cannot write to WARC file.\n" msgstr "無法寫入‘%s’(%s)。\n" -#: src/http.c:4381 +#: src/http.c:4406 msgid "Cannot write to temporary WARC file.\n" msgstr "" -#: src/http.c:4386 +#: src/http.c:4411 msgid "Unable to establish SSL connection.\n" msgstr "無法建立 SSL 連線。\n" -#: src/http.c:4392 +#: src/http.c:4417 #, fuzzy, c-format msgid "Cannot unlink %s (%s).\n" msgstr "無法寫入‘%s’(%s)。\n" -#: src/http.c:4402 +#: src/http.c:4427 #, c-format msgid "ERROR: Redirection (%d) without location.\n" msgstr "錯誤: é‡æ–°å°Žå‘ (%d) 但沒有指定ä½ç½®ã€‚\n" -#: src/http.c:4424 +#: src/http.c:4449 msgid "" "Could not find Metalink data in HTTP response. Downloading file using HTTP " "GET.\n" msgstr "" -#: src/http.c:4433 +#: src/http.c:4458 msgid "Metalink headers found. Switching to Metalink mode.\n" msgstr "" -#: src/http.c:4473 +#: src/http.c:4498 msgid "Remote file does not exist -- broken link!!!\n" msgstr "" -#: src/http.c:4500 +#: src/http.c:4525 msgid "Last-modified header missing -- time-stamps turned off.\n" msgstr "缺少了最後修改時間標頭 ─ 關閉時間標記。\n" -#: src/http.c:4508 +#: src/http.c:4533 msgid "Last-modified header invalid -- time-stamp ignored.\n" msgstr "無效的最後修改時間標頭 ─ 忽略時間標記。\n" -#: src/http.c:4538 +#: src/http.c:4563 #, fuzzy, c-format msgid "" "Server file no newer than local file %s -- not retrieving.\n" @@ -1210,16 +1185,16 @@ msgstr "" "é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" "\n" -#: src/http.c:4546 +#: src/http.c:4571 #, c-format msgid "The sizes do not match (local %s) -- retrieving.\n" msgstr "檔案大å°ä¸ç¬¦ (本機檔案為 %s) -- 會下載檔案。\n" -#: src/http.c:4555 +#: src/http.c:4580 msgid "Remote file is newer, retrieving.\n" msgstr "é ç«¯æª”案較新，會下載檔案。\n" -#: src/http.c:4573 +#: src/http.c:4598 #, fuzzy msgid "" "Remote file exists and could contain links to other resources -- " @@ -1227,33 +1202,33 @@ msgid "" "\n" msgstr "é ç«¯æª”案較本機檔案‘%s’新 ─ 會下載檔案。\n" -#: src/http.c:4579 +#: src/http.c:4604 #, fuzzy msgid "" "Remote file exists but does not contain any link -- not retrieving.\n" "\n" msgstr "é ç«¯æª”案ä¸æ¯”本機檔案‘%s’新 ─ ä¸æœƒä¸‹è¼‰ã€‚\n" -#: src/http.c:4588 +#: src/http.c:4613 msgid "" "Remote file exists and could contain further links,\n" "but recursion is disabled -- not retrieving.\n" "\n" msgstr "" -#: src/http.c:4594 +#: src/http.c:4619 #, fuzzy msgid "" "Remote file exists.\n" "\n" msgstr "é ç«¯æª”案較新，會下載檔案。\n" -#: src/http.c:4603 +#: src/http.c:4628 #, fuzzy, c-format msgid "%s URL: %s %2d %s\n" msgstr "%s: URL ‘%s’ 無效: %s\n" -#: src/http.c:4653 +#: src/http.c:4678 #, fuzzy, c-format msgid "" "%s (%s) - written to stdout %s[%s/%s]\n" @@ -1262,7 +1237,7 @@ msgstr "" "%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" "\n" -#: src/http.c:4654 +#: src/http.c:4679 #, fuzzy, c-format msgid "" "%s (%s) - %s saved [%s/%s]\n" @@ -1271,58 +1246,58 @@ msgstr "" "%s (%s) -- 已儲存 ‘%s’ [%s/%s])\n" "\n" -#: src/http.c:4715 +#: src/http.c:4740 #, c-format msgid "%s (%s) - Connection closed at byte %s. " msgstr "%s (%s) - 在 %s ä½å…ƒçµ„後連線çªç„¶ä¸­æ–·ã€‚ " -#: src/http.c:4738 +#: src/http.c:4763 #, c-format msgid "%s (%s) - Read error at byte %s (%s)." msgstr "%s (%s) - 讀å–至 %s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:4747 +#: src/http.c:4772 #, c-format msgid "%s (%s) - Read error at byte %s/%s (%s). " msgstr "%s (%s) - 讀å–至 %s/%s ä½å…ƒçµ„時發生錯誤 (%s)。" -#: src/http.c:4985 +#: src/http.c:5010 #, c-format msgid "Unsupported quality of protection '%s'.\n" msgstr "" -#: src/http.c:4990 +#: src/http.c:5015 #, fuzzy, c-format msgid "Unsupported algorithm '%s'.\n" msgstr "ä¸æ”¯æ´é€™ç¨® URL æ ¼å¼" -#: src/init.c:582 +#: src/init.c:581 #, fuzzy, c-format msgid "" "%s: WGETRC points to %s, which couldn't be accessed because of error: %s.\n" msgstr "%s: WGETRC ä½ç½®ç‚º %s，但該檔案ä¸å­˜åœ¨ã€‚\n" -#: src/init.c:683 src/netrc.c:246 +#: src/init.c:682 src/netrc.c:250 #, c-format msgid "%s: Cannot read %s (%s).\n" msgstr "%s: ç„¡æ³•è®€å– %s (%s)。\n" -#: src/init.c:700 +#: src/init.c:699 #, c-format msgid "%s: Error in %s at line %d.\n" msgstr "%1$s: 錯誤發生於第 %3$d 行的 %2$s。\n" -#: src/init.c:706 +#: src/init.c:705 #, c-format msgid "%s: Syntax error in %s at line %d.\n" msgstr "%1$s: 錯誤發生於第 %3$d 行的 %2$s。\n" -#: src/init.c:711 +#: src/init.c:710 #, fuzzy, c-format msgid "%s: Unknown command %s in %s at line %d.\n" msgstr "%1$s: 第 %4$d 行的 %3$s 出ç¾ä¸æ˜ŽæŒ‡ä»¤ ‘%2$s’。\n" -#: src/init.c:750 +#: src/init.c:749 #, c-format msgid "" "Parsing system wgetrc file (env SYSTEM_WGETRC) failed. Please check\n" @@ -1330,7 +1305,7 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:765 +#: src/init.c:764 #, c-format msgid "" "Parsing system wgetrc file failed. Please check\n" @@ -1338,115 +1313,115 @@ msgid "" "or specify a different file using --config.\n" msgstr "" -#: src/init.c:781 +#: src/init.c:780 #, fuzzy, c-format msgid "%s: Warning: Both system and user wgetrc point to %s.\n" msgstr "%s: 警告: 系統與使用者的 wgetrc 都指å‘‘%s’。\n" -#: src/init.c:976 +#: src/init.c:975 #, fuzzy, c-format msgid "%s: Invalid --execute command %s\n" msgstr "%s: --execute 指令 ‘%s’ 無效\n" -#: src/init.c:1037 +#: src/init.c:1036 #, fuzzy, c-format msgid "%s: %s: Invalid boolean %s; use `on' or `off'.\n" msgstr "%s: %s: é‚輯值 ‘%s’ 無效，請使用 ‘on’ 或 ‘off’。\n" -#: src/init.c:1070 +#: src/init.c:1069 #, fuzzy, c-format msgid "%s: %s: Invalid %s; use `on', `off' or `quiet'.\n" msgstr "%s: %s: é‚輯值 ‘%s’ 無效，請使用 ‘on’ 或 ‘off’。\n" -#: src/init.c:1088 +#: src/init.c:1087 #, fuzzy, c-format msgid "%s: %s: Invalid number %s.\n" msgstr "%s: %s: 數值 ‘%s’ 無效。\n" -#: src/init.c:1169 +#: src/init.c:1168 #, c-format msgid "%s: %s must only be used once\n" msgstr "" -#: src/init.c:1324 src/init.c:1343 +#: src/init.c:1323 src/init.c:1342 #, fuzzy, c-format msgid "%s: %s: Invalid byte value %s\n" msgstr "%s: %s: ä½å…ƒå€¼ ‘%s’ 無效。\n" -#: src/init.c:1368 +#: src/init.c:1367 #, fuzzy, c-format msgid "%s: %s: Invalid time period %s\n" msgstr "%s: %s: 時間 ‘%s’ 無效。\n" -#: src/init.c:1430 src/main.c:1859 +#: src/init.c:1429 src/main.c:1871 #, c-format msgid "" "use-askpass requires a string or either environment variable WGET_ASKPASS or " "SSH_ASKPASS to be set.\n" msgstr "" -#: src/init.c:1448 src/init.c:1470 src/init.c:1578 src/init.c:1634 -#: src/init.c:1700 src/init.c:1719 src/init.c:1744 +#: src/init.c:1447 src/init.c:1469 src/init.c:1577 src/init.c:1633 +#: src/init.c:1699 src/init.c:1718 src/init.c:1743 #, fuzzy, c-format msgid "%s: %s: Invalid value %s.\n" msgstr "%s: %s: 數值 ‘%s’ 無效。\n" -#: src/init.c:1504 +#: src/init.c:1503 #, fuzzy, c-format msgid "%s: %s: Invalid header %s.\n" msgstr "%s: %s: 標頭內容 ‘%s’ 無效。\n" -#: src/init.c:1525 +#: src/init.c:1524 #, fuzzy, c-format msgid "%s: %s: Invalid WARC header %s.\n" msgstr "%s: %s: 標頭內容 ‘%s’ 無效。\n" -#: src/init.c:1591 +#: src/init.c:1590 #, fuzzy, c-format msgid "%s: %s: Invalid progress type %s.\n" msgstr "%s: %s: 無效的進度指示方å¼â€˜%s’。\n" -#: src/init.c:1673 +#: src/init.c:1672 #, fuzzy, c-format msgid "" "%s: %s: Invalid restriction %s,\n" " use [unix|vms|windows],[lowercase|uppercase],[nocontrol],[ascii].\n" msgstr "%s: %s: 作業系統類型 ‘%s’ 無效，請使用 unix 或 windows。\n" -#: src/iri.c:114 +#: src/iri.c:113 #, c-format msgid "Encoding %s isn't valid\n" msgstr "" -#: src/iri.c:140 src/url.c:1572 +#: src/iri.c:139 src/url.c:1570 #, c-format msgid "Conversion from %s to %s isn't supported\n" msgstr "" -#: src/iri.c:180 src/url.c:1600 +#: src/iri.c:179 src/url.c:1598 msgid "Incomplete or invalid multibyte sequence encountered\n" msgstr "" -#: src/iri.c:199 src/url.c:1617 +#: src/iri.c:198 src/url.c:1615 #, c-format msgid "Unhandled errno %d\n" msgstr "" -#: src/iri.c:236 +#: src/iri.c:235 msgid "locale_to_utf8: locale is unset\n" msgstr "" -#: src/iri.c:282 src/iri.c:297 +#: src/iri.c:281 src/iri.c:296 #, c-format msgid "idn_encode failed (%d): %s\n" msgstr "" -#: src/iri.c:289 +#: src/iri.c:288 #, fuzzy, c-format msgid "Failed to convert to lower: %d: %s\n" msgstr "無法連上 %s 的埠號 %d: %s\n" -#: src/log.c:921 src/log.c:940 +#: src/log.c:922 src/log.c:941 #, fuzzy, c-format msgid "" "\n" @@ -1455,17 +1430,17 @@ msgstr "" "\n" "下載 %s 完畢，將輸出導å‘至‘%s’。\n" -#: src/log.c:933 +#: src/log.c:934 #, c-format msgid "%s: %s; disabling logging.\n" msgstr "%s: %s；無法進行任何記錄。\n" -#: src/main.c:557 +#: src/main.c:566 #, c-format msgid "Usage: %s [OPTION]... [URL]...\n" msgstr "用法: %s [é¸é …]... [URL]...\n" -#: src/main.c:569 +#: src/main.c:578 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "\n" @@ -1473,99 +1448,99 @@ msgstr "" "é•·é¸é …必須用的åƒæ•¸åœ¨ä½¿ç”¨çŸ­é¸é …時也是必須的。\n" "\n" -#: src/main.c:571 +#: src/main.c:580 msgid "Startup:\n" msgstr "啟動：\n" -#: src/main.c:573 +#: src/main.c:582 #, fuzzy msgid "" " -V, --version display the version of Wget and exit\n" msgstr " -V, --version 顯示 Wget 版本並離開\n" -#: src/main.c:575 +#: src/main.c:584 #, fuzzy msgid " -h, --help print this help\n" msgstr " -h, --help å°å‡ºé€™æ®µèªªæ˜Žæ–‡å­—\n" -#: src/main.c:577 +#: src/main.c:586 #, fuzzy msgid " -b, --background go to background after startup\n" msgstr " -b, --background 啟動後進入背景作業\n" -#: src/main.c:579 +#: src/main.c:588 #, fuzzy msgid " -e, --execute=COMMAND execute a `.wgetrc'-style command\n" msgstr " -e, --execute=指令 執行 ‘.wgetrc’ å½¢å¼çš„指令\n" -#: src/main.c:583 +#: src/main.c:592 msgid "Logging and input file:\n" msgstr "紀錄訊æ¯åŠè¼¸å…¥æª”案：\n" -#: src/main.c:585 +#: src/main.c:594 #, fuzzy msgid " -o, --output-file=FILE log messages to FILE\n" msgstr " -o, --output-file=檔案 將紀錄訊æ¯å¯«å…¥<檔案>中\n" -#: src/main.c:587 +#: src/main.c:596 #, fuzzy msgid " -a, --append-output=FILE append messages to FILE\n" msgstr " -a, --append-output=檔案 將紀錄訊æ¯åŠ å…¥<檔案>末端\n" -#: src/main.c:590 +#: src/main.c:599 #, fuzzy msgid "" " -d, --debug print lots of debugging information\n" msgstr " -d, --debug å°å‡ºåµéŒ¯è¨Šæ¯\n" -#: src/main.c:594 +#: src/main.c:603 #, fuzzy msgid " --wdebug print Watt-32 debug output\n" msgstr " -d, --debug å°å‡ºåµéŒ¯è¨Šæ¯\n" -#: src/main.c:597 +#: src/main.c:606 #, fuzzy msgid " -q, --quiet quiet (no output)\n" msgstr " -q, --quiet 安éœæ¨¡å¼ (ä¸è¼¸å‡ºè¨Šæ¯)\n" -#: src/main.c:599 +#: src/main.c:608 #, fuzzy msgid " -v, --verbose be verbose (this is the default)\n" msgstr " -v, --verbose è©³ç´°è¼¸å‡ºæ¨¡å¼ (é è¨­ä½¿ç”¨é€™å€‹æ¨¡å¼)\n" -#: src/main.c:601 +#: src/main.c:610 #, fuzzy msgid "" " -nv, --no-verbose turn off verboseness, without being " "quiet\n" msgstr " -nv, --non-verbose 關閉詳細輸出模å¼ï¼Œä½†ä¸å•Ÿç”¨å®‰éœæ¨¡å¼\n" -#: src/main.c:603 +#: src/main.c:612 msgid "" " --report-speed=TYPE output bandwidth as TYPE. TYPE can be " "bits\n" msgstr "" -#: src/main.c:605 +#: src/main.c:614 #, fuzzy msgid "" " -i, --input-file=FILE download URLs found in local or external " "FILE\n" msgstr " -i, --input-file=檔案 下載從檔案中找到的 URL\n" -#: src/main.c:608 +#: src/main.c:617 #, fuzzy msgid "" " --input-metalink=FILE download files covered in local Metalink " "FILE\n" msgstr " -i, --input-file=檔案 下載從檔案中找到的 URL\n" -#: src/main.c:611 +#: src/main.c:620 #, fuzzy msgid " -F, --force-html treat input file as HTML\n" msgstr " -F, --force-html 以 HTML æ–¹å¼è™•ç†è¼¸å…¥æª”\n" -#: src/main.c:613 +#: src/main.c:622 #, fuzzy msgid "" " -B, --base=URL resolves HTML input-file links (-i -F)\n" @@ -1573,83 +1548,83 @@ msgid "" msgstr "" " -N, --timestamping 除éžé ç«¯æª”案比較新，å¦å‰‡ä¸ä¸‹è¼‰é ç«¯æª”案\n" -#: src/main.c:616 +#: src/main.c:625 #, fuzzy msgid " --config=FILE specify config file to use\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" -#: src/main.c:618 +#: src/main.c:627 #, fuzzy msgid " --no-config do not read any config file\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" -#: src/main.c:620 +#: src/main.c:629 msgid "" " --rejected-log=FILE log reasons for URL rejection to FILE\n" msgstr "" -#: src/main.c:624 +#: src/main.c:633 msgid "Download:\n" msgstr "下載：\n" -#: src/main.c:626 +#: src/main.c:635 #, fuzzy msgid "" " -t, --tries=NUMBER set number of retries to NUMBER (0 " "unlimits)\n" msgstr " -t, --tries=次數 設定é‡è©¦æ¬¡æ•¸ (0 表示無é™)\n" -#: src/main.c:628 +#: src/main.c:637 #, fuzzy msgid "" " --retry-connrefused retry even if connection is refused\n" msgstr " --retry-connrefused å³ä½¿é€£ç·šè¢«æ‹’ä»ç„¶æœƒä¸æ–·å˜—試\n" -#: src/main.c:630 +#: src/main.c:639 #, fuzzy msgid " -O, --output-document=FILE write documents to FILE\n" msgstr " -O --output-document=檔案 將資料寫入指定檔案中\n" -#: src/main.c:632 +#: src/main.c:641 #, fuzzy msgid "" " -nc, --no-clobber skip downloads that would download to\n" " existing files (overwriting them)\n" msgstr " -nc, --no-clobber ä¸è¦†å¯«å·²ç¶“存在的檔案\n" -#: src/main.c:635 +#: src/main.c:644 #, fuzzy msgid "" " --no-netrc don't try to obtain credentials from ." "netrc\n" -msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" +msgstr " -np, --no-parent ä¸é€²å…¥ä¸Šå±¤çš„目錄\n" -#: src/main.c:637 +#: src/main.c:646 #, fuzzy msgid "" " -c, --continue resume getting a partially-downloaded " "file\n" msgstr " -c, --continue 繼續下載已下載了一部份的檔案\n" -#: src/main.c:639 +#: src/main.c:648 msgid "" " --start-pos=OFFSET start downloading from zero-based " "position OFFSET\n" msgstr "" -#: src/main.c:641 +#: src/main.c:650 #, fuzzy msgid " --progress=TYPE select progress gauge type\n" msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:643 +#: src/main.c:652 #, fuzzy msgid "" " --show-progress display the progress bar in any verbosity " "mode\n" msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:645 +#: src/main.c:654 #, fuzzy msgid "" " -N, --timestamping don't re-retrieve files unless newer " @@ -1658,41 +1633,41 @@ msgid "" msgstr "" " -N, --timestamping 除éžé ç«¯æª”案比較新，å¦å‰‡ä¸ä¸‹è¼‰é ç«¯æª”案\n" -#: src/main.c:648 +#: src/main.c:657 msgid "" " --no-if-modified-since don't use conditional if-modified-since " "get\n" " requests in timestamping mode\n" msgstr "" -#: src/main.c:651 +#: src/main.c:660 msgid "" " --no-use-server-timestamps don't set the local file's timestamp by\n" " the one on the server\n" msgstr "" -#: src/main.c:654 +#: src/main.c:663 #, fuzzy msgid " -S, --server-response print server response\n" msgstr " -S, --server-response 顯示伺æœå™¨å›žæ‡‰è¨Šæ¯\n" -#: src/main.c:656 +#: src/main.c:665 #, fuzzy msgid " --spider don't download anything\n" msgstr " --spider ä¸ä¸‹è¼‰ä»»ä½•è³‡æ–™\n" -#: src/main.c:658 +#: src/main.c:667 #, fuzzy msgid " -T, --timeout=SECONDS set all timeout values to SECONDS\n" msgstr " -T, --timeout=秒數 指定所有時é™ç‚ºåŒä¸€æ•¸å€¼\n" -#: src/main.c:661 +#: src/main.c:670 msgid "" " --dns-servers=ADDRESSES list of DNS servers to query (comma " "separated)\n" msgstr "" -#: src/main.c:663 +#: src/main.c:672 #, fuzzy msgid "" " --bind-dns-address=ADDRESS bind DNS resolver to ADDRESS (hostname or " @@ -1701,27 +1676,27 @@ msgstr "" " --bind-address=ä½å€ 使用本機的指定ä½å€ (主機å稱或 IP) 進行連" "ç·š\n" -#: src/main.c:666 +#: src/main.c:675 #, fuzzy msgid " --dns-timeout=SECS set the DNS lookup timeout to SECS\n" msgstr " --dns-timeout=秒數 指定 DNS 查找主機的時é™\n" -#: src/main.c:668 +#: src/main.c:677 #, fuzzy msgid " --connect-timeout=SECS set the connect timeout to SECS\n" msgstr " --connect-timeout=秒數 指定連線時é™\n" -#: src/main.c:670 +#: src/main.c:679 #, fuzzy msgid " --read-timeout=SECS set the read timeout to SECS\n" msgstr " --read-timeout=秒數 指定讀å–資料的時é™\n" -#: src/main.c:672 +#: src/main.c:681 #, fuzzy msgid " -w, --wait=SECONDS wait SECONDS between retrievals\n" msgstr " -w, --wait=秒數 æ¯æ¬¡ä¸‹è¼‰æª”案之å‰ç­‰å¾…指定秒數\n" -#: src/main.c:674 +#: src/main.c:683 #, fuzzy msgid "" " --waitretry=SECONDS wait 1..SECONDS between retries of a " @@ -1730,24 +1705,24 @@ msgstr "" " --waitretry=秒數 æ¯æ¬¡é‡è¦†å˜—試å‰ç¨ç­‰ä¸€æ®µæ™‚é–“ (ç”± 1 秒至指\n" " 定秒數ä¸ç­‰)\n" -#: src/main.c:676 +#: src/main.c:685 #, fuzzy msgid "" " --random-wait wait from 0.5*WAIT...1.5*WAIT secs " "between retrievals\n" msgstr " --random-wait æ¯æ¬¡ä¸‹è¼‰ä¹‹å‰éš¨æ©Ÿåœ°æŒ‡å®šç­‰å¾…的時間\n" -#: src/main.c:678 +#: src/main.c:687 #, fuzzy msgid " --no-proxy explicitly turn off proxy\n" msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†ä¼ºæœå™¨\n" -#: src/main.c:680 +#: src/main.c:689 #, fuzzy msgid " -Q, --quota=NUMBER set retrieval quota to NUMBER\n" msgstr " -Q, --quota=å¤§å° è¨­å®šä¸‹è¼‰è³‡æ–™çš„é™é¡å¤§å°\n" -#: src/main.c:682 +#: src/main.c:691 #, fuzzy msgid "" " --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local " @@ -1756,17 +1731,17 @@ msgstr "" " --bind-address=ä½å€ 使用本機的指定ä½å€ (主機å稱或 IP) 進行連" "ç·š\n" -#: src/main.c:684 +#: src/main.c:693 #, fuzzy msgid " --limit-rate=RATE limit download rate to RATE\n" msgstr " --limit-rate=速率 é™åˆ¶ä¸‹è¼‰é€ŸçŽ‡\n" -#: src/main.c:686 +#: src/main.c:695 #, fuzzy msgid " --no-dns-cache disable caching DNS lookups\n" msgstr " --no-dns-cache ä¸è¨˜æ†¶ DNS 查找主機的資料\n" -#: src/main.c:688 +#: src/main.c:697 #, fuzzy msgid "" " --restrict-file-names=OS restrict chars in file names to ones OS " @@ -1774,24 +1749,24 @@ msgid "" msgstr "" " --restrict-file-names=OS åªä½¿ç”¨ä½œæ¥­ç³»çµ±èƒ½å¤ æŽ¥å—的字元作為檔案字元\n" -#: src/main.c:690 +#: src/main.c:699 #, fuzzy msgid "" " --ignore-case ignore case when matching files/" "directories\n" msgstr " --ignore-length 忽略 ‘Content-Length’ 標頭欄ä½\n" -#: src/main.c:693 +#: src/main.c:702 #, fuzzy msgid " -4, --inet4-only connect only to IPv4 addresses\n" msgstr " -4, --inet4-only åªæœƒé€£æŽ¥ IPv4 地å€\n" -#: src/main.c:695 +#: src/main.c:704 #, fuzzy msgid " -6, --inet6-only connect only to IPv6 addresses\n" msgstr " -6, --inet6-only åªæœƒé€£æŽ¥ IPv6 地å€\n" -#: src/main.c:697 +#: src/main.c:706 #, fuzzy msgid "" " --prefer-family=FAMILY connect first to addresses of specified " @@ -1801,23 +1776,23 @@ msgstr "" " --prefer-family=FAMILY 優先採用指定的ä½å€æ ¼å¼ï¼Œå¯ä»¥æ˜¯ IPv6ã€IPv4\n" " 或者 none\n" -#: src/main.c:701 +#: src/main.c:710 #, fuzzy msgid " --user=USER set both ftp and http user to USER\n" msgstr " --user=用戶 指定 ftp å’Œ http 用戶å稱\n" -#: src/main.c:703 +#: src/main.c:712 #, fuzzy msgid "" " --password=PASS set both ftp and http password to PASS\n" msgstr " --password=PASS 指定 ftp å’Œ http 密碼\n" -#: src/main.c:705 +#: src/main.c:714 #, fuzzy msgid " --ask-password prompt for passwords\n" msgstr " --password=PASS 指定 ftp å’Œ http 密碼\n" -#: src/main.c:707 +#: src/main.c:716 msgid "" " --use-askpass=COMMAND specify credential handler for " "requesting \n" @@ -1828,159 +1803,158 @@ msgid "" " environment variable is used.\n" msgstr "" -#: src/main.c:712 +#: src/main.c:721 #, fuzzy msgid " --no-iri turn off IRI support\n" msgstr " --no-proxy ç¦æ­¢ä½¿ç”¨ä»£ç†ä¼ºæœå™¨\n" -#: src/main.c:714 +#: src/main.c:723 msgid "" " --local-encoding=ENC use ENC as the local encoding for IRIs\n" msgstr "" -#: src/main.c:716 +#: src/main.c:725 msgid "" " --remote-encoding=ENC use ENC as the default remote encoding\n" msgstr "" -#: src/main.c:718 +#: src/main.c:727 #, fuzzy msgid " --unlink remove file before clobber\n" msgstr " --no-glob ä¸å±•é–‹æœ‰è¬ç”¨å­—元的 FTP 檔å\n" -#: src/main.c:721 +#: src/main.c:730 msgid "" " --keep-badhash keep files with checksum mismatch " "(append .badhash)\n" msgstr "" -#: src/main.c:723 -#, fuzzy +#: src/main.c:732 msgid "" " --metalink-index=NUMBER Metalink application/metalink4+xml " "metaurl ordinal NUMBER\n" -msgstr " -Q, --quota=å¤§å° è¨­å®šä¸‹è¼‰è³‡æ–™çš„é™é¡å¤§å°\n" +msgstr "" -#: src/main.c:725 +#: src/main.c:734 msgid "" " --metalink-over-http use Metalink metadata from HTTP response " "headers\n" msgstr "" -#: src/main.c:727 +#: src/main.c:736 msgid "" " --preferred-location preferred location for Metalink " "resources\n" msgstr "" -#: src/main.c:731 +#: src/main.c:740 msgid "" " --no-xattr turn off storage of metadata in extended " "file attributes\n" msgstr "" -#: src/main.c:736 +#: src/main.c:745 msgid "Directories:\n" msgstr "目錄：\n" -#: src/main.c:738 +#: src/main.c:747 #, fuzzy msgid " -nd, --no-directories don't create directories\n" msgstr " -nd --no-directories ä¸å»ºç«‹ç›®éŒ„\n" -#: src/main.c:740 +#: src/main.c:749 #, fuzzy msgid " -x, --force-directories force creation of directories\n" msgstr " -x, --force-directories 強制建立目錄\n" -#: src/main.c:742 +#: src/main.c:751 #, fuzzy msgid " -nH, --no-host-directories don't create host directories\n" msgstr " -nH, --no-host-directories ä¸å»ºç«‹å«æœ‰é ç«¯ä¸»æ©Ÿå稱的目錄\n" -#: src/main.c:744 +#: src/main.c:753 #, fuzzy msgid " --protocol-directories use protocol name in directories\n" msgstr " --protocol-directories 在目錄中加上通訊å”定å稱\n" -#: src/main.c:746 +#: src/main.c:755 #, fuzzy msgid " -P, --directory-prefix=PREFIX save files to PREFIX/..\n" msgstr " -P, --directory-prefix=å稱 儲存檔案å‰å…ˆå»ºç«‹æŒ‡å®šå稱的目錄\n" -#: src/main.c:748 +#: src/main.c:757 #, fuzzy msgid "" " --cut-dirs=NUMBER ignore NUMBER remote directory " "components\n" msgstr " --cut-dirs=數目 忽略é ç«¯ç›®éŒ„中指定<數目>的目錄層\n" -#: src/main.c:752 +#: src/main.c:761 msgid "HTTP options:\n" msgstr "HTTP é¸é …：\n" -#: src/main.c:754 +#: src/main.c:763 #, fuzzy msgid " --http-user=USER set http user to USER\n" msgstr " --http-user=用戶 指定 HTTP 用戶å稱\n" -#: src/main.c:756 +#: src/main.c:765 #, fuzzy msgid " --http-password=PASS set http password to PASS\n" msgstr " --http-passwd=密碼 指定 HTTP 密碼\n" -#: src/main.c:758 +#: src/main.c:767 #, fuzzy msgid " --no-cache disallow server-cached data\n" msgstr " --no-cache ä¸ä½¿ç”¨ä¼ºæœå™¨ä¸­çš„å¿«å–記憶資料\n" -#: src/main.c:760 +#: src/main.c:769 msgid "" " --default-page=NAME change the default page name (normally\n" " this is 'index.html'.)\n" msgstr "" -#: src/main.c:763 +#: src/main.c:772 #, fuzzy msgid "" " -E, --adjust-extension save HTML/CSS documents with proper " "extensions\n" msgstr " -E, --html-extension 將所有 HTML 文件加上 “.html†延伸檔å\n" -#: src/main.c:765 +#: src/main.c:774 #, fuzzy msgid "" " --ignore-length ignore 'Content-Length' header field\n" msgstr " --ignore-length 忽略 ‘Content-Length’ 標頭欄ä½\n" -#: src/main.c:767 +#: src/main.c:776 #, fuzzy msgid " --header=STRING insert STRING among the headers\n" msgstr " --header=字串 在連線資料標頭中加入指定字串\n" -#: src/main.c:770 +#: src/main.c:779 #, fuzzy msgid "" " --compression=TYPE choose compression, one of auto, gzip and " "none\n" msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:773 +#: src/main.c:782 msgid "" " --max-redirect maximum redirections allowed per page\n" msgstr "" -#: src/main.c:775 +#: src/main.c:784 #, fuzzy msgid " --proxy-user=USER set USER as proxy username\n" msgstr " --proxy-user=用戶 設定代ç†ä¼ºæœå™¨ç”¨æˆ¶å稱\n" -#: src/main.c:777 +#: src/main.c:786 #, fuzzy msgid " --proxy-password=PASS set PASS as proxy password\n" msgstr " --proxy-password=密碼 設定代ç†ä¼ºæœå™¨å¯†ç¢¼\n" -#: src/main.c:779 +#: src/main.c:788 #, fuzzy msgid "" " --referer=URL include 'Referer: URL' header in HTTP " @@ -1988,82 +1962,82 @@ msgid "" msgstr "" " --referer=URL 在 HTTP 請求中包括 ‘Referer: URL’ 標頭\n" -#: src/main.c:781 +#: src/main.c:790 #, fuzzy msgid " --save-headers save the HTTP headers to file\n" msgstr " --save-headers å°‡ HTTP 連線資料標頭存檔\n" -#: src/main.c:783 +#: src/main.c:792 #, fuzzy msgid "" " -U, --user-agent=AGENT identify as AGENT instead of Wget/" "VERSION\n" msgstr " -U, --user-agent=AGENT 宣稱為 AGENT 而ä¸æ˜¯ Wget/VERSION\n" -#: src/main.c:785 +#: src/main.c:794 #, fuzzy msgid "" " --no-http-keep-alive disable HTTP keep-alive (persistent " "connections)\n" msgstr " --no-http-keep-alive ä¸ä½¿ç”¨ HTTP keep-alive (æŒä¹…性連線)\n" -#: src/main.c:787 +#: src/main.c:796 #, fuzzy msgid " --no-cookies don't use cookies\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" -#: src/main.c:789 +#: src/main.c:798 #, fuzzy msgid "" " --load-cookies=FILE load cookies from FILE before session\n" msgstr " --load-cookies=檔案 程å¼å•Ÿå‹•æ™‚由指定檔案載入 cookie\n" -#: src/main.c:791 +#: src/main.c:800 #, fuzzy msgid " --save-cookies=FILE save cookies to FILE after session\n" msgstr " --save-cookies=檔案 程å¼çµæŸå¾Œå°‡ cookie 儲存至指定檔案\n" -#: src/main.c:793 +#: src/main.c:802 #, fuzzy msgid "" " --keep-session-cookies load and save session (non-permanent) " "cookies\n" msgstr " --keep-session-cookies 會載入和儲存暫時性的 cookie\n" -#: src/main.c:795 +#: src/main.c:804 #, fuzzy msgid "" " --post-data=STRING use the POST method; send STRING as the " "data\n" msgstr " --post-data=字串 使用 POST æ–¹å¼é€å‡ºå­—串\n" -#: src/main.c:797 +#: src/main.c:806 #, fuzzy msgid "" " --post-file=FILE use the POST method; send contents of " "FILE\n" msgstr " --post-file=檔案 使用 POST æ–¹å¼é€å‡ºæª”案內容\n" -#: src/main.c:799 +#: src/main.c:808 msgid "" " --method=HTTPMethod use method \"HTTPMethod\" in the request\n" msgstr "" -#: src/main.c:801 +#: src/main.c:810 #, fuzzy msgid "" " --body-data=STRING send STRING as data. --method MUST be " "set\n" msgstr " --post-data=字串 使用 POST æ–¹å¼é€å‡ºå­—串\n" -#: src/main.c:803 +#: src/main.c:812 #, fuzzy msgid "" " --body-file=FILE send contents of FILE. --method MUST be " "set\n" msgstr " --post-file=檔案 使用 POST æ–¹å¼é€å‡ºæª”案內容\n" -#: src/main.c:805 +#: src/main.c:814 msgid "" " --content-disposition honor the Content-Disposition header " "when\n" @@ -2071,13 +2045,13 @@ msgid "" "(EXPERIMENTAL)\n" msgstr "" -#: src/main.c:808 +#: src/main.c:817 msgid "" " --content-on-error output the received content on server " "errors\n" msgstr "" -#: src/main.c:810 +#: src/main.c:819 msgid "" " --auth-no-challenge send Basic HTTP authentication " "information\n" @@ -2085,11 +2059,11 @@ msgid "" " challenge\n" msgstr "" -#: src/main.c:817 +#: src/main.c:826 msgid "HTTPS (SSL/TLS) options:\n" msgstr "HTTPS (SSL/TLS) é¸é …：\n" -#: src/main.c:819 +#: src/main.c:828 #, fuzzy msgid "" " --secure-protocol=PR choose secure protocol, one of auto, " @@ -2099,57 +2073,57 @@ msgstr "" " --secure-protocol=PR é¸æ“‡å®‰å…¨é€šè¨Šå”定，å¯ä»¥ä½¿ç”¨ auto, SSLv2, \n" " SSLv3 或 TLSv1\n" -#: src/main.c:822 +#: src/main.c:831 #, fuzzy msgid " --https-only only follow secure HTTPS links\n" msgstr " -L, --relative åªè·Ÿéš¨ç›¸å°éˆçµ\n" -#: src/main.c:824 +#: src/main.c:833 #, fuzzy msgid "" " --no-check-certificate don't validate the server's certificate\n" msgstr " --no-check-certificate ä¸æª¢é©—伺æœå™¨çš„憑證\n" -#: src/main.c:826 +#: src/main.c:835 #, fuzzy msgid " --certificate=FILE client certificate file\n" msgstr " --certificate=檔案 指定用戶端的憑證檔案å稱\n" -#: src/main.c:828 +#: src/main.c:837 #, fuzzy msgid "" " --certificate-type=TYPE client certificate type, PEM or DER\n" msgstr " --certificate-type=é¡žåž‹ 用戶端憑證的類型，å¯ä»¥æ˜¯ PEM 或 DER\n" -#: src/main.c:830 +#: src/main.c:839 #, fuzzy msgid " --private-key=FILE private key file\n" msgstr " --private-key=檔案 指定ç§é‘°æª”案\n" -#: src/main.c:832 +#: src/main.c:841 #, fuzzy msgid " --private-key-type=TYPE private key type, PEM or DER\n" msgstr " --private-key-type=é¡žåž‹ ç§é‘°çš„類型，å¯ä»¥æ˜¯ PEM 或 DER\n" -#: src/main.c:834 +#: src/main.c:843 #, fuzzy msgid " --ca-certificate=FILE file with the bundle of CAs\n" msgstr " --ca-certificate=檔案 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的檔案\n" # (Abel) 這裡 hashed filename å’Œé¸é …的用æ„無關，所以ä¸ç¿»è­¯ -#: src/main.c:836 +#: src/main.c:845 #, fuzzy msgid "" " --ca-directory=DIR directory where hash list of CAs is " "stored\n" msgstr " --ca-directory=目錄 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的目錄\n" -#: src/main.c:838 +#: src/main.c:847 #, fuzzy msgid " --crl-file=FILE file with bundle of CRLs\n" msgstr " --ca-certificate=檔案 載有憑證管ç†ä¸­å¿ƒ (CA) 簽章的檔案\n" -#: src/main.c:840 +#: src/main.c:849 msgid "" " --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n" " of base64 encoded sha256 hashes preceded " @@ -2159,7 +2133,7 @@ msgid "" " peer against\n" msgstr "" -#: src/main.c:846 +#: src/main.c:855 #, fuzzy msgid "" " --random-file=FILE file with random data for seeding the SSL " @@ -2168,71 +2142,71 @@ msgstr "" " --random-file=檔案 作為 SSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 的來æºæ•¸æ“šæª”" "案\n" -#: src/main.c:850 +#: src/main.c:859 #, fuzzy msgid "" " --egd-file=FILE file naming the EGD socket with random " "data\n" msgstr " --egd-file=檔案 產生隨機數據的 EGD socket 檔案å稱\n" -#: src/main.c:857 +#: src/main.c:866 #, fuzzy msgid "HSTS options:\n" msgstr "HTTP é¸é …：\n" -#: src/main.c:859 +#: src/main.c:868 #, fuzzy msgid " --no-hsts disable HSTS\n" msgstr " --no-cache ä¸ä½¿ç”¨ä¼ºæœå™¨ä¸­çš„å¿«å–記憶資料\n" -#: src/main.c:861 +#: src/main.c:870 msgid "" " --hsts-file path of HSTS database (will override " "default)\n" msgstr "" -#: src/main.c:866 +#: src/main.c:875 msgid "FTP options:\n" msgstr "FTP é¸é …：\n" -#: src/main.c:869 +#: src/main.c:878 msgid "" " --ftp-stmlf use Stream_LF format for all binary FTP " "files\n" msgstr "" -#: src/main.c:872 +#: src/main.c:881 #, fuzzy msgid " --ftp-user=USER set ftp user to USER\n" msgstr " --ftp-user=用戶 指定 FTP 用戶å稱\n" -#: src/main.c:874 +#: src/main.c:883 #, fuzzy msgid " --ftp-password=PASS set ftp password to PASS\n" msgstr " --ftp-password=密碼 設定 FTP 密碼\n" -#: src/main.c:876 +#: src/main.c:885 #, fuzzy msgid " --no-remove-listing don't remove '.listing' files\n" msgstr " --no-remove-listing ä¸åˆªé™¤ ‘.listing’ 檔案\n" -#: src/main.c:878 +#: src/main.c:887 #, fuzzy msgid " --no-glob turn off FTP file name globbing\n" msgstr " --no-glob ä¸å±•é–‹æœ‰è¬ç”¨å­—元的 FTP 檔å\n" -#: src/main.c:880 +#: src/main.c:889 #, fuzzy msgid "" " --no-passive-ftp disable the \"passive\" transfer mode\n" msgstr " --no-passive-ftp ä¸ä½¿ç”¨ã€Œè¢«å‹•ã€å‚³è¼¸æ¨¡å¼\n" -#: src/main.c:882 +#: src/main.c:891 #, fuzzy msgid " --preserve-permissions preserve remote file permissions\n" msgstr " --preserve-permissions 沿用é ç«¯æª”案的權é™\n" -#: src/main.c:884 +#: src/main.c:893 #, fuzzy msgid "" " --retr-symlinks when recursing, get linked-to files (not " @@ -2241,117 +2215,117 @@ msgstr "" " --retr-symlinks 在éžè¿´æ¨¡å¼ä¸­ï¼Œä¸‹è¼‰éˆçµæŒ‡ç¤ºçš„目標檔案 \n" " (ä¸åŒ…括目錄)\n" -#: src/main.c:889 +#: src/main.c:898 #, fuzzy msgid "FTPS options:\n" msgstr "FTP é¸é …：\n" -#: src/main.c:891 +#: src/main.c:900 msgid "" " --ftps-implicit use implicit FTPS (default port is " "990)\n" msgstr "" -#: src/main.c:893 +#: src/main.c:902 msgid "" " --ftps-resume-ssl resume the SSL/TLS session started in " "the control connection when\n" " opening a data connection\n" msgstr "" -#: src/main.c:896 +#: src/main.c:905 msgid "" " --ftps-clear-data-connection cipher the control channel only; all " "the data will be in plaintext\n" msgstr "" -#: src/main.c:898 +#: src/main.c:907 msgid "" " --ftps-fallback-to-ftp fall back to FTP if FTPS is not " "supported in the target server\n" msgstr "" -#: src/main.c:902 +#: src/main.c:911 #, fuzzy msgid "WARC options:\n" msgstr "FTP é¸é …：\n" -#: src/main.c:904 +#: src/main.c:913 msgid "" " --warc-file=FILENAME save request/response data to a .warc.gz " "file\n" msgstr "" -#: src/main.c:906 +#: src/main.c:915 #, fuzzy msgid "" " --warc-header=STRING insert STRING into the warcinfo record\n" msgstr " --header=字串 在連線資料標頭中加入指定字串\n" -#: src/main.c:908 +#: src/main.c:917 #, fuzzy msgid "" " --warc-max-size=NUMBER set maximum size of WARC files to NUMBER\n" msgstr " -t, --tries=次數 設定é‡è©¦æ¬¡æ•¸ (0 表示無é™)\n" -#: src/main.c:910 +#: src/main.c:919 #, fuzzy msgid " --warc-cdx write CDX index files\n" msgstr " --spider ä¸ä¸‹è¼‰ä»»ä½•è³‡æ–™\n" -#: src/main.c:912 +#: src/main.c:921 msgid "" " --warc-dedup=FILENAME do not store records listed in this CDX " "file\n" msgstr "" -#: src/main.c:915 +#: src/main.c:924 msgid "" " --no-warc-compression do not compress WARC files with GZIP\n" msgstr "" -#: src/main.c:918 +#: src/main.c:927 #, fuzzy msgid " --no-warc-digests do not calculate SHA1 digests\n" msgstr " --no-cookies ä¸ä½¿ç”¨ cookie\n" -#: src/main.c:920 +#: src/main.c:929 msgid "" " --no-warc-keep-log do not store the log file in a WARC " "record\n" msgstr "" -#: src/main.c:922 +#: src/main.c:931 msgid "" " --warc-tempdir=DIRECTORY location for temporary files created by " "the\n" " WARC writer\n" msgstr "" -#: src/main.c:927 +#: src/main.c:936 msgid "Recursive download:\n" msgstr "éžè¿´ä¸‹è¼‰ï¼š\n" -#: src/main.c:929 +#: src/main.c:938 #, fuzzy msgid " -r, --recursive specify recursive download\n" msgstr " -r, --recursive éžè¿´ä¸‹è¼‰\n" -#: src/main.c:931 +#: src/main.c:940 #, fuzzy msgid "" " -l, --level=NUMBER maximum recursion depth (inf or 0 for " "infinite)\n" msgstr " -l, --level=數字 最大æœå°‹æ·±åº¦ (inf 或 0 表示無é™)\n" -#: src/main.c:933 +#: src/main.c:942 #, fuzzy msgid "" " --delete-after delete files locally after downloading " "them\n" msgstr " --delete-after 刪除下載後的檔案\n" -#: src/main.c:935 +#: src/main.c:944 #, fuzzy msgid "" " -k, --convert-links make links in downloaded HTML or CSS " @@ -2359,33 +2333,33 @@ msgid "" " local files\n" msgstr " -k, --convert-links 將下載後的 HTML çš„éˆçµè½‰æ›ç‚ºæœ¬åœ°æª”案\n" -#: src/main.c:938 +#: src/main.c:947 msgid "" " --convert-file-only convert the file part of the URLs only " "(usually known as the basename)\n" msgstr "" -#: src/main.c:940 +#: src/main.c:949 msgid "" " --backups=N before writing file X, rotate up to N " "backup files\n" msgstr "" -#: src/main.c:944 +#: src/main.c:953 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as " "X_orig\n" msgstr " -K, --backup-converted 將檔案 X 轉æ›å‰å…ˆå‚™ä»½ç‚º X.orig\n" -#: src/main.c:947 +#: src/main.c:956 #, fuzzy msgid "" " -K, --backup-converted before converting file X, back up as X." "orig\n" msgstr " -K, --backup-converted 將檔案 X 轉æ›å‰å…ˆå‚™ä»½ç‚º X.orig\n" -#: src/main.c:950 +#: src/main.c:959 #, fuzzy msgid "" " -m, --mirror shortcut for -N -r -l inf --no-remove-" @@ -2393,217 +2367,217 @@ msgid "" msgstr "" " -m, --mirror 相等於 -N -r -l inf --no-remove-listing é¸é …\n" -#: src/main.c:952 +#: src/main.c:961 #, fuzzy msgid "" " -p, --page-requisites get all images, etc. needed to display " "HTML page\n" msgstr " -p, --page-requisites 下載所有顯示網é æ‰€éœ€çš„檔案，例如圖片等\n" -#: src/main.c:954 +#: src/main.c:963 #, fuzzy msgid "" " --strict-comments turn on strict (SGML) handling of HTML " "comments\n" msgstr " --strict-comments ç”¨åš´æ ¼æ–¹å¼ (SGML) è™•ç† HTML 注釋。\n" -#: src/main.c:958 +#: src/main.c:967 msgid "Recursive accept/reject:\n" msgstr "éžè¿´ä¸‹è¼‰æ™‚有關接å—/拒絕的é¸é …：\n" -#: src/main.c:960 +#: src/main.c:969 #, fuzzy msgid "" " -A, --accept=LIST comma-separated list of accepted " "extensions\n" msgstr " -A, --accept=清單 接å—的檔案樣å¼ï¼Œä»¥é€—號分隔\n" -#: src/main.c:962 +#: src/main.c:971 #, fuzzy msgid "" " -R, --reject=LIST comma-separated list of rejected " "extensions\n" msgstr " -R, --reject=清單 排除的檔案樣å¼ï¼Œä»¥é€—號分隔\n" -#: src/main.c:964 +#: src/main.c:973 msgid " --accept-regex=REGEX regex matching accepted URLs\n" msgstr "" -#: src/main.c:966 +#: src/main.c:975 msgid " --reject-regex=REGEX regex matching rejected URLs\n" msgstr "" -#: src/main.c:969 +#: src/main.c:978 #, fuzzy msgid " --regex-type=TYPE regex type (posix|pcre)\n" msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:972 +#: src/main.c:981 #, fuzzy msgid " --regex-type=TYPE regex type (posix)\n" msgstr " --progress=æ–¹å¼ é¸æ“‡ä¸‹è¼‰é€²åº¦çš„表示方å¼\n" -#: src/main.c:975 +#: src/main.c:984 #, fuzzy msgid "" " -D, --domains=LIST comma-separated list of accepted domains\n" msgstr " -D, --domains=清單 接å—的網域，以逗號分隔\n" -#: src/main.c:977 +#: src/main.c:986 #, fuzzy msgid "" " --exclude-domains=LIST comma-separated list of rejected domains\n" msgstr " --exclude-domains=清單 排除的網域，以逗號分隔\n" -#: src/main.c:979 +#: src/main.c:988 #, fuzzy msgid "" " --follow-ftp follow FTP links from HTML documents\n" msgstr " --follow-ftp 跟隨 HTML 文件中的 FTP éˆçµ\n" -#: src/main.c:981 +#: src/main.c:990 #, fuzzy msgid "" " --follow-tags=LIST comma-separated list of followed HTML " "tags\n" msgstr " --follow-tags=清單 會跟隨的 HTML 標籤，以逗號分隔\n" -#: src/main.c:983 +#: src/main.c:992 #, fuzzy msgid "" " --ignore-tags=LIST comma-separated list of ignored HTML " "tags\n" msgstr " -G, --ignore-tags=清單 會忽略的 HTML 標籤，以逗號分隔\n" -#: src/main.c:985 +#: src/main.c:994 #, fuzzy msgid " -H, --span-hosts go to foreign hosts when recursive\n" msgstr " -H, --span-hosts éžè¿´æ¨¡å¼ä¸­å¯é€²å…¥å…¶å®ƒä¸»æ©Ÿ\n" -#: src/main.c:987 +#: src/main.c:996 #, fuzzy msgid " -L, --relative follow relative links only\n" msgstr " -L, --relative åªè·Ÿéš¨ç›¸å°éˆçµ\n" -#: src/main.c:989 +#: src/main.c:998 #, fuzzy msgid " -I, --include-directories=LIST list of allowed directories\n" msgstr " -I, --include-directories=清單 準備下載的目錄\n" -#: src/main.c:991 +#: src/main.c:1000 msgid "" " --trust-server-names use the name specified by the " "redirection\n" " URL's last component\n" msgstr "" -#: src/main.c:994 +#: src/main.c:1003 #, fuzzy msgid " -X, --exclude-directories=LIST list of excluded directories\n" msgstr " -X, --exclude-directories=清單 準備排除的目錄\n" -#: src/main.c:996 +#: src/main.c:1005 #, fuzzy msgid "" " -np, --no-parent don't ascend to the parent directory\n" msgstr " -np, --no-parent ä¸é€²å…¥ä¸Šå±¤çš„目錄\n" -#: src/main.c:999 +#: src/main.c:1008 #, fuzzy msgid "Mail bug reports and suggestions to \n" msgstr "請將錯誤報告或建議寄給 。\n" -#: src/main.c:1004 +#: src/main.c:1013 #, c-format msgid "GNU Wget %s, a non-interactive network retriever.\n" msgstr "GNU Wget %s，éžäº’å‹•å¼æª”案下載工具。\n" -#: src/main.c:1047 +#: src/main.c:1056 #, c-format msgid "Password for user %s: " msgstr "" -#: src/main.c:1049 +#: src/main.c:1058 #, c-format msgid "Password: " msgstr "" -#: src/main.c:1068 +#: src/main.c:1077 #, c-format msgid "Cannot create pipe\n" msgstr "" -#: src/main.c:1076 +#: src/main.c:1085 #, c-format msgid "Error initializing spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1085 +#: src/main.c:1094 #, c-format msgid "Error setting spawn file actions for use-askpass: %d\n" msgstr "" -#: src/main.c:1109 +#: src/main.c:1118 #, c-format msgid "Error reading response from command \"%s %s\": %s\n" msgstr "" -#: src/main.c:1132 +#: src/main.c:1141 #, c-format msgid "Username for '%s%s': " msgstr "" -#: src/main.c:1142 +#: src/main.c:1151 #, c-format msgid "Password for '%s%s@%s': " msgstr "" -#: src/main.c:1214 +#: src/main.c:1223 msgid "Wgetrc: " msgstr "" -#: src/main.c:1215 +#: src/main.c:1224 msgid "Locale: " msgstr "" -#: src/main.c:1216 +#: src/main.c:1225 msgid "Compile: " msgstr "" -#: src/main.c:1217 +#: src/main.c:1226 msgid "Link: " msgstr "" -#: src/main.c:1221 +#: src/main.c:1230 #, c-format msgid "" "GNU Wget %s built on %s.\n" "\n" msgstr "" -#: src/main.c:1248 +#: src/main.c:1257 #, c-format msgid " %s (env)\n" msgstr "" -#: src/main.c:1255 +#: src/main.c:1264 #, c-format msgid " %s (user)\n" msgstr "" -#: src/main.c:1260 +#: src/main.c:1269 #, c-format msgid " %s (system)\n" msgstr "" #. TRANSLATORS: When available, an actual copyright character #. (circle-c) should be used in preference to "(C)". -#: src/main.c:1288 +#: src/main.c:1297 #, fuzzy, c-format msgid "Copyright (C) %s Free Software Foundation, Inc.\n" msgstr "版權所有 (C) 2005 自由軟體基金會\n" -#: src/main.c:1291 +#: src/main.c:1300 msgid "" "License GPLv3+: GNU GPL version 3 or later\n" ".\n" @@ -2613,7 +2587,7 @@ msgstr "" #. TRANSLATORS: When available, please use the proper diacritics for #. names such as this one. See en_US.po for reference. -#: src/main.c:1299 +#: src/main.c:1308 msgid "" "\n" "Originally written by Hrvoje Niksic .\n" @@ -2621,66 +2595,66 @@ msgstr "" "\n" "最åˆç”± Hrvoje Niksic 編寫。\n" -#: src/main.c:1302 +#: src/main.c:1311 #, fuzzy msgid "Please send bug reports and questions to .\n" msgstr "請將錯誤報告或建議寄給 。\n" -#: src/main.c:1351 src/main.c:1882 +#: src/main.c:1360 src/main.c:1894 #, c-format msgid "Memory allocation problem\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1410 #, c-format msgid "Exiting due to error in %s\n" msgstr "" -#: src/main.c:1430 src/main.c:1501 src/main.c:1733 +#: src/main.c:1439 src/main.c:1510 src/main.c:1745 #, c-format msgid "Try `%s --help' for more options.\n" msgstr "請嘗試執行‘%s --help’查看更多é¸é …。\n" -#: src/main.c:1497 +#: src/main.c:1506 #, c-format msgid "%s: illegal option -- `-n%c'\n" msgstr "%s: é¸é …ä¸åˆæ³• -- ‘-n%c’\n" -#: src/main.c:1540 +#: src/main.c:1552 #, c-format msgid "Debugging support not compiled in. Ignoring --debug flag.\n" msgstr "" -#: src/main.c:1553 +#: src/main.c:1565 #, c-format msgid "" "Both --no-clobber and --convert-links were specified, only --convert-links " "will be used.\n" msgstr "" -#: src/main.c:1555 +#: src/main.c:1567 #, c-format msgid "" "Both --no-clobber and --convert-file-only were specified, only --convert-" "file-only will be used.\n" msgstr "" -#: src/main.c:1588 +#: src/main.c:1600 #, c-format msgid "Can't be verbose and quiet at the same time.\n" msgstr "無法åŒæ™‚使用詳細輸出模å¼åŠå®‰éœæ¨¡å¼ã€‚\n" -#: src/main.c:1594 +#: src/main.c:1606 #, c-format msgid "Can't timestamp and not clobber old files at the same time.\n" msgstr "無法åŒæ™‚使用時間標記而ä¸æ›´æ”¹æœ¬æ©Ÿæª”案。\n" -#: src/main.c:1603 +#: src/main.c:1615 #, c-format msgid "Cannot specify both --inet4-only and --inet6-only.\n" msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" -#: src/main.c:1613 +#: src/main.c:1625 msgid "" "Cannot specify both -k or --convert-file-only and -O if multiple URLs are " "given, or in combination\n" @@ -2688,157 +2662,152 @@ msgid "" "\n" msgstr "" -#: src/main.c:1622 +#: src/main.c:1634 msgid "" "WARNING: combining -O with -r or -p will mean that all downloaded content\n" "will be placed in the single file you specified.\n" "\n" msgstr "" -#: src/main.c:1628 +#: src/main.c:1640 msgid "" "WARNING: timestamping does nothing in combination with -O. See the manual\n" "for details.\n" "\n" msgstr "" -#: src/main.c:1637 -#, c-format -msgid "File `%s' already there; not retrieving.\n" -msgstr "檔案 ‘%s’ 已存在，ä¸æœƒä¸‹è¼‰ã€‚\n" - -#: src/main.c:1648 +#: src/main.c:1660 #, c-format msgid "" "WARC output does not work with --no-clobber, --no-clobber will be disabled.\n" msgstr "" -#: src/main.c:1655 +#: src/main.c:1667 #, c-format msgid "" "WARC output does not work with timestamping, timestamping will be disabled.\n" msgstr "" -#: src/main.c:1662 +#: src/main.c:1674 #, c-format msgid "WARC output does not work with --spider.\n" msgstr "" -#: src/main.c:1668 +#: src/main.c:1680 #, c-format msgid "" "WARC output does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1676 +#: src/main.c:1688 #, c-format msgid "" "Digests are disabled; WARC deduplication will not find duplicate records.\n" msgstr "" -#: src/main.c:1697 +#: src/main.c:1709 #, c-format msgid "" "Compression does not work with --continue or --start-pos, they will be " "disabled.\n" msgstr "" -#: src/main.c:1708 +#: src/main.c:1720 #, fuzzy, c-format msgid "Cannot specify both --ask-password and --password.\n" msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" -#: src/main.c:1716 +#: src/main.c:1728 #, c-format msgid "" "Specifying both --start-pos and --continue is not recommended; --continue " "will be disabled.\n" msgstr "" -#: src/main.c:1728 +#: src/main.c:1740 #, c-format msgid "%s: missing URL\n" msgstr "%s: 未指定 URL\n" -#: src/main.c:1769 +#: src/main.c:1781 #, fuzzy, c-format msgid "You cannot specify both --post-data and --post-file.\n" msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" -#: src/main.c:1774 +#: src/main.c:1786 #, c-format msgid "" "You cannot use --post-data or --post-file along with --method. --method " "expects data through --body-data and --body-file options\n" msgstr "" -#: src/main.c:1783 +#: src/main.c:1795 #, c-format msgid "" "You must specify a method through --method=HTTPMethod to use with --body-" "data or --body-file.\n" msgstr "" -#: src/main.c:1789 +#: src/main.c:1801 #, fuzzy, c-format msgid "You cannot specify both --body-data and --body-file.\n" msgstr "ä¸å¯ä»¥åŒæ™‚使用 --inet4-only å’Œ --inet6-only é¸é …。\n" -#: src/main.c:1841 +#: src/main.c:1853 #, c-format msgid "This version does not have support for IRIs\n" msgstr "" -#: src/main.c:1951 +#: src/main.c:1960 #, c-format msgid "" "-k or -r can be used together with -O only if outputting to a regular file.\n" msgstr "" -#: src/main.c:1957 +#: src/main.c:1966 #, c-format msgid "" "--convert-links or --convert-file-only can be used together only if " "outputting to a regular file.\n" msgstr "" -#: src/main.c:1968 +#: src/main.c:1977 #, c-format msgid "Failed to init libcares\n" msgstr "" -#: src/main.c:1974 +#: src/main.c:1983 #, c-format msgid "Failed to init c-ares channel\n" msgstr "" -#: src/main.c:1997 +#: src/main.c:2006 #, c-format msgid "Failed to parse IP address '%s'\n" msgstr "" -#: src/main.c:2008 +#: src/main.c:2017 #, c-format msgid "Failed to set DNS server(s) '%s' (%d)\n" msgstr "" -#: src/main.c:2136 +#: src/main.c:2145 #, c-format msgid "No URLs found in %s.\n" msgstr "在 %s 中找ä¸åˆ° URL。\n" -#: src/main.c:2152 +#: src/main.c:2161 #, fuzzy, c-format msgid "Unable to parse metalink file %s.\n" msgstr "無法刪除‘%s’: %s\n" -#: src/main.c:2182 src/metalink.c:337 +#: src/main.c:2191 src/metalink.c:337 #, c-format msgid "Could not download all resources from %s.\n" msgstr "" -#: src/main.c:2209 +#: src/main.c:2218 #, fuzzy, c-format msgid "" "FINISHED --%s--\n" @@ -2849,7 +2818,7 @@ msgstr "" "å®Œæˆ --%s--\n" "下載了: %s ä½å…ƒçµ„，共 %d 個檔案\n" -#: src/main.c:2223 +#: src/main.c:2232 #, fuzzy, c-format msgid "Download quota of %s EXCEEDED!\n" msgstr "超éŽä¸‹è¼‰é™é¡ (%s ä½å…ƒçµ„)ï¼\n" @@ -3005,119 +2974,119 @@ msgstr "" msgid "Renaming %s to %s.\n" msgstr "刪除 %s。\n" -#: src/mswindows.c:97 +#: src/mswindows.c:96 #, c-format msgid "Continuing in background.\n" msgstr "繼續在背景中執行。\n" -#: src/mswindows.c:290 +#: src/mswindows.c:289 #, c-format msgid "Continuing in background, pid %lu.\n" msgstr "繼續在背景中執行，pid 為 %lu。\n" -#: src/mswindows.c:292 src/utils.c:510 +#: src/mswindows.c:291 src/utils.c:505 #, fuzzy, c-format msgid "Output will be written to %s.\n" msgstr "將輸出資料寫入 ‘%s’。\n" -#: src/mswindows.c:324 +#: src/mswindows.c:323 #, c-format msgid "fake_fork_child() failed\n" msgstr "" -#: src/mswindows.c:332 +#: src/mswindows.c:331 #, c-format msgid "fake_fork() failed\n" msgstr "" -#: src/mswindows.c:460 src/mswindows.c:467 +#: src/mswindows.c:459 src/mswindows.c:466 #, c-format msgid "%s: Couldn't find usable socket driver.\n" msgstr "%s: 找ä¸åˆ°å¯ç”¨çš„ socket 驅動程å¼ã€‚\n" -#: src/mswindows.c:647 +#: src/mswindows.c:646 #, c-format msgid "ioctl() failed. The socket could not be set as blocking.\n" msgstr "" -#: src/netrc.c:366 +#: src/netrc.c:370 #, fuzzy, c-format msgid "%s: %s:%d: warning: %s token appears before any machine name\n" msgstr "%s: %s:%d: 警告: 「%sã€å‡ºç¾åœ¨ä¸»æ©Ÿå稱之å‰\n" -#: src/netrc.c:407 +#: src/netrc.c:411 #, c-format msgid "%s: %s:%d: unknown token \"%s\"\n" msgstr "%s: %s:%d: ä¸æ˜Žçš„標記「%sã€\n" -#: src/netrc.c:470 +#: src/netrc.c:477 #, c-format msgid "Usage: %s NETRC [HOSTNAME]\n" msgstr "用法: %s NETRC [主機å稱]\n" -#: src/netrc.c:488 +#: src/netrc.c:495 #, c-format msgid "%s: cannot stat %s: %s\n" msgstr "%s：無法 stat() %s：%s\n" -#: src/openssl.c:123 +#: src/openssl.c:122 msgid "WARNING: using a weak random seed.\n" msgstr "警告：隨機數å“質ä¸å¤ ã€‚\n" -#: src/openssl.c:195 +#: src/openssl.c:199 msgid "Could not seed PRNG; consider using --random-file.\n" msgstr "" "無法產生 OpenSSL éš¨æ©Ÿæ•¸ç”¢ç”Ÿç¨‹åº (PRNG) 使用的種å­ï¼›è«‹è€ƒæ…®ä½¿ç”¨ --random-file " "é¸é …。\n" -#: src/openssl.c:245 +#: src/openssl.c:268 msgid "Your OpenSSL version is too old to support TLSv1.1\n" msgstr "" -#: src/openssl.c:249 +#: src/openssl.c:272 msgid "Your OpenSSL version is too old to support TLSv1.2\n" msgstr "" -#: src/openssl.c:254 +#: src/openssl.c:277 #, c-format msgid "OpenSSL: unimplemented 'secure-protocol' option value %d\n" msgstr "" -#: src/openssl.c:798 +#: src/openssl.c:826 #, fuzzy, c-format msgid "%s: cannot verify %s's certificate, issued by %s:\n" msgstr "%s：%s 沒有æ供憑證。\n" -#: src/openssl.c:809 +#: src/openssl.c:837 msgid " Unable to locally verify the issuer's authority.\n" msgstr "" -#: src/openssl.c:814 +#: src/openssl.c:842 msgid " Self-signed certificate encountered.\n" msgstr "" -#: src/openssl.c:817 +#: src/openssl.c:845 msgid " Issued certificate not yet valid.\n" msgstr "" -#: src/openssl.c:820 +#: src/openssl.c:848 msgid " Issued certificate has expired.\n" msgstr "" -#: src/openssl.c:908 +#: src/openssl.c:936 #, fuzzy, c-format msgid "" "%s: no certificate subject alternative name matches\n" "\trequested host name %s.\n" msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" -#: src/openssl.c:927 +#: src/openssl.c:955 #, fuzzy, c-format msgid "" " %s: certificate common name %s doesn't match requested host name %s.\n" msgstr "%s：憑證的 common name ‘%s’ 和主機å稱 ‘%s’ ä¸ç¬¦ã€‚\n" -#: src/openssl.c:959 +#: src/openssl.c:987 #, c-format msgid "" " %s: certificate common name is invalid (contains a NUL character).\n" @@ -3125,12 +3094,12 @@ msgid "" " (that is, it is not the real %s).\n" msgstr "" -#: src/openssl.c:984 +#: src/openssl.c:1012 #, c-format msgid "To connect to %s insecurely, use `--no-check-certificate'.\n" msgstr "如果ä¸æƒ³ç”¨å®‰å…¨æ¨¡å¼é€£æŽ¥ %s，請使用 ‘--no-check-certificate’ é¸é …\n" -#: src/progress.c:245 +#: src/progress.c:244 #, fuzzy, c-format msgid "" "\n" @@ -3139,28 +3108,28 @@ msgstr "" "\n" "%*s[ ç•¥éŽ %dK ]" -#: src/progress.c:466 +#: src/progress.c:465 #, fuzzy, c-format msgid "Invalid dot style specification %s; leaving unchanged.\n" msgstr "é€²åº¦æŒ‡ç¤ºæ–¹å¼ â€˜%s’ 無效；ä¸æœƒæ”¹è®ŠåŽŸä¾†æ–¹å¼ã€‚\n" #. TRANSLATORS: "ETA" is English-centric, but this must #. be short, ideally 3 chars. Abbreviate if necessary. -#: src/progress.c:858 +#: src/progress.c:857 #, c-format msgid " eta %s" msgstr "" -#: src/progress.c:1148 +#: src/progress.c:1147 msgid " in " msgstr "" -#: src/ptimer.c:158 +#: src/ptimer.c:157 #, c-format msgid "Cannot get REALTIME clock frequency: %s\n" msgstr "無法讀å–實時時é˜çš„頻率：%s\n" -#: src/recur.c:514 +#: src/recur.c:512 #, c-format msgid "Removing %s since it should be rejected.\n" msgstr "刪除 %s，因為它應該被指定了拒絕下載。\n" @@ -3174,22 +3143,22 @@ msgstr "無法開啟 %s: %s" msgid "Loading robots.txt; please ignore errors.\n" msgstr "正在載入 robots.txt；請忽略錯誤訊æ¯ã€‚\n" -#: src/retr.c:913 +#: src/retr.c:912 #, c-format msgid "Error parsing proxy URL %s: %s.\n" msgstr "分æžä»£ç†ä¼ºæœå™¨ URL %s 時發生錯誤: %s。\n" -#: src/retr.c:925 +#: src/retr.c:924 #, c-format msgid "Error in proxy URL %s: Must be HTTP.\n" msgstr "代ç†ä¼ºæœå™¨ URL %s 錯誤: 必須是 HTTP。\n" -#: src/retr.c:1054 +#: src/retr.c:1053 #, c-format msgid "%d redirections exceeded.\n" msgstr "å·²è¶…éŽ %d 次é‡æ–°å°Žå‘。\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Giving up.\n" "\n" @@ -3197,7 +3166,7 @@ msgstr "" "放棄。\n" "\n" -#: src/retr.c:1318 +#: src/retr.c:1317 msgid "" "Retrying.\n" "\n" @@ -3205,124 +3174,124 @@ msgstr "" "準備é‡è©¦ã€‚\n" "\n" -#: src/url.c:676 +#: src/url.c:674 msgid "No error" msgstr "沒有錯誤" -#: src/url.c:678 +#: src/url.c:676 #, fuzzy, c-format msgid "Unsupported scheme %s" msgstr "ä¸æ”¯æ´é€™ç¨® URL æ ¼å¼" -#: src/url.c:680 +#: src/url.c:678 msgid "Scheme missing" msgstr "" -#: src/url.c:682 +#: src/url.c:680 msgid "Invalid host name" msgstr "主機å稱無效" -#: src/url.c:684 +#: src/url.c:682 msgid "Bad port number" msgstr "通訊埠號錯誤" -#: src/url.c:686 +#: src/url.c:684 msgid "Invalid user name" msgstr "用戶å稱無效" -#: src/url.c:688 +#: src/url.c:686 msgid "Unterminated IPv6 numeric address" msgstr "未完æˆçš„ IPv6 ä½å€" -#: src/url.c:690 +#: src/url.c:688 msgid "IPv6 addresses not supported" msgstr "ä¸æ”¯æ´ IPv6 ä½å€" -#: src/url.c:692 +#: src/url.c:690 msgid "Invalid IPv6 numeric address" msgstr "IPv6 ä½å€ç„¡æ•ˆ" -#: src/url.c:1008 +#: src/url.c:1006 msgid "HTTPS support not compiled in" msgstr "" -#: src/url.c:1603 +#: src/url.c:1601 msgid "Unconvertable multibyte sequence encountered\n" msgstr "" -#: src/utils.c:130 +#: src/utils.c:125 #, fuzzy, c-format msgid "%s: %s: Failed to allocate enough memory; memory exhausted.\n" msgstr "%s：%sï¼šç„¡æ³•åˆ†é… %ld ä½å…ƒçµ„，記憶體已耗盡。\n" -#: src/utils.c:136 +#: src/utils.c:131 #, c-format msgid "%s: %s: Failed to allocate %ld bytes; memory exhausted.\n" msgstr "%s：%sï¼šç„¡æ³•åˆ†é… %ld ä½å…ƒçµ„，記憶體已耗盡。\n" -#: src/utils.c:356 +#: src/utils.c:351 #, c-format msgid "%s: aprintf: text buffer is too big (%d bytes), aborting.\n" msgstr "" -#: src/utils.c:508 +#: src/utils.c:503 #, c-format msgid "Continuing in background, pid %d.\n" msgstr "繼續在背景中執行，pid 為 %d。\n" -#: src/utils.c:584 +#: src/utils.c:579 #, fuzzy, c-format msgid "Failed to unlink symlink %s: %s\n" msgstr "無法刪除符號éˆçµ '%s': %s\n" -#: src/utils.c:884 -#, fuzzy, c-format +#: src/utils.c:879 +#, c-format msgid "Failed to Fopen file %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "" -#: src/utils.c:890 -#, fuzzy, c-format +#: src/utils.c:885 +#, c-format msgid "Failed to get FD for file %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "" -#: src/utils.c:897 -#, fuzzy, c-format +#: src/utils.c:892 +#, c-format msgid "Failed to stat file %s, (check permissions)\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "" -#: src/utils.c:907 +#: src/utils.c:902 #, c-format msgid "File %s changed since the last check. Security check failed." msgstr "" -#: src/utils.c:942 -#, fuzzy, c-format +#: src/utils.c:937 +#, c-format msgid "Failed to open file %s, reason :%s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "" -#: src/utils.c:948 -#, fuzzy, c-format +#: src/utils.c:943 +#, c-format msgid "Failed to stat file %s, error: %s\n" -msgstr "無法寫入代ç†ä¼ºæœå™¨: %s。\n" +msgstr "" -#: src/utils.c:957 +#: src/utils.c:952 #, c-format msgid "" "Trying to open file %s but it changed since last check. Security check " "failed." msgstr "" -#: src/utils.c:2461 src/utils.c:2480 +#: src/utils.c:2456 src/utils.c:2475 #, c-format msgid "Invalid regular expression %s, %s\n" msgstr "" -#: src/utils.c:2504 src/utils.c:2528 +#: src/utils.c:2499 src/utils.c:2523 #, fuzzy, c-format msgid "Error while matching %s: %d\n" msgstr "寫入‘%s’時發生錯誤: %s\n" -#: src/utils.c:2821 +#: src/utils.c:2816 #, c-format msgid "Skipping key with wrong size (%d/%d): %s\n" msgstr "" @@ -3399,23 +3368,24 @@ msgstr "" msgid "Found exact match in CDX file. Saving revisit record to WARC.\n" msgstr "" -#, fuzzy -#~ msgid "Invalid UTF-8 sequence: %s\n" -#~ msgstr "%s: URL ‘%s’ 無效: %s\n" - -#~ msgid "" -#~ "\n" -#~ "%s received.\n" -#~ msgstr "" -#~ "\n" -#~ "下載 %s 完畢。\n" - #~ msgid "Error in Set-Cookie, field `%s'" #~ msgstr "Set-Cookie 的欄ä½â€˜%s’出ç¾éŒ¯èª¤" +#~ msgid "%s: option `--%s' doesn't allow an argument\n" +#~ msgstr "%s: é¸é …‘--%s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" + +#~ msgid "%s: unrecognized option `--%s'\n" +#~ msgstr "%s: 無法識別é¸é …‘--%s’\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: é¸é …ä¸åˆæ³• ─ %c\n" +#~ msgid "%s: option `-W %s' is ambiguous\n" +#~ msgstr "%s: é¸é …‘-W %s’ä¸æ˜Žç¢º\n" + +#~ msgid "%s: option `-W %s' doesn't allow an argument\n" +#~ msgstr "%s: é¸é …‘-W %s’ä¸å¯é…åˆå¼•æ•¸ä½¿ç”¨\n" + #~ msgid "Authorization failed.\n" #~ msgstr "èªè­‰å¤±æ•—ï¼\n" @@ -3429,6 +3399,13 @@ msgstr "" #~ "%s: %s: é‚輯值 ‘%s’ 無效，\n" #~ "請使用 ‘always’, ‘on’, ‘off’ 或 ‘never’。\n" +#~ msgid "" +#~ "\n" +#~ "%s received.\n" +#~ msgstr "" +#~ "\n" +#~ "下載 %s 完畢。\n" + #~ msgid "" #~ " -B, --base=URL prepends URL to relative links in -F -i " #~ "file.\n" diff --git a/src/Makefile.am b/src/Makefile.am index 28c0be2..d26b014 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2011, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/Makefile.in b/src/Makefile.in index 95bbc60..d7a66b7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,9 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2011, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -153,7 +151,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -169,28 +168,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -228,17 +228,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -444,6 +445,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -460,6 +462,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -467,6 +470,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -539,6 +543,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -584,6 +589,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -632,6 +638,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -668,6 +675,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -691,7 +699,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -699,6 +709,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -722,6 +733,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -762,6 +774,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -784,12 +797,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -810,6 +825,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -903,6 +919,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -957,13 +974,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -980,6 +1001,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1010,6 +1032,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1044,6 +1068,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1115,6 +1140,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1148,6 +1174,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1186,10 +1213,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1298,6 +1327,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1314,11 +1344,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1327,6 +1360,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1357,6 +1391,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1364,6 +1399,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1374,7 +1411,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/src/config.h.in b/src/config.h.in index 5131d55..5a51490 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,5 +1,80 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ +/* CPU and C ABI indicator */ +#ifndef __i386__ +#undef __i386__ +#endif +#ifndef __x86_64_x32__ +#undef __x86_64_x32__ +#endif +#ifndef __x86_64__ +#undef __x86_64__ +#endif +#ifndef __alpha__ +#undef __alpha__ +#endif +#ifndef __arm__ +#undef __arm__ +#endif +#ifndef __armhf__ +#undef __armhf__ +#endif +#ifndef __arm64_ilp32__ +#undef __arm64_ilp32__ +#endif +#ifndef __arm64__ +#undef __arm64__ +#endif +#ifndef __hppa__ +#undef __hppa__ +#endif +#ifndef __hppa64__ +#undef __hppa64__ +#endif +#ifndef __ia64_ilp32__ +#undef __ia64_ilp32__ +#endif +#ifndef __ia64__ +#undef __ia64__ +#endif +#ifndef __m68k__ +#undef __m68k__ +#endif +#ifndef __mips__ +#undef __mips__ +#endif +#ifndef __mipsn32__ +#undef __mipsn32__ +#endif +#ifndef __mips64__ +#undef __mips64__ +#endif +#ifndef __powerpc__ +#undef __powerpc__ +#endif +#ifndef __powerpc64__ +#undef __powerpc64__ +#endif +#ifndef __powerpc64_elfv2__ +#undef __powerpc64_elfv2__ +#endif +#ifndef __s390__ +#undef __s390__ +#endif +#ifndef __s390x__ +#undef __s390x__ +#endif +#ifndef __sh__ +#undef __sh__ +#endif +#ifndef __sparc__ +#undef __sparc__ +#endif +#ifndef __sparc64__ +#undef __sparc64__ +#endif + + /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -128,6 +203,10 @@ whether the gnulib module mkostemp shall be considered present. */ #undef GNULIB_MKOSTEMP +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module msvc-nothrow shall be considered present. */ +#undef GNULIB_MSVC_NOTHROW + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module pipe2-safer shall be considered present. */ #undef GNULIB_PIPE2_SAFER @@ -152,6 +231,10 @@ whether the gnulib module strerror shall be considered present. */ #undef GNULIB_STRERROR +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module strerror_r-posix shall be considered present. */ +#undef GNULIB_STRERROR_R_POSIX + /* Define to 1 when the gnulib module accept should be tested. */ #undef GNULIB_TEST_ACCEPT @@ -417,6 +500,9 @@ /* Define to 1 when the gnulib module unlink should be tested. */ #undef GNULIB_TEST_UNLINK +/* Define to 1 when the gnulib module utime should be tested. */ +#undef GNULIB_TEST_UTIME + /* Define to 1 when the gnulib module vasprintf should be tested. */ #undef GNULIB_TEST_VASPRINTF @@ -484,6 +570,9 @@ /* Define to 1 if you have the `confstr' function. */ #undef HAVE_CONFSTR +/* Define to 1 if you have the header file. */ +#undef HAVE_CRTDEFS_H + /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT @@ -576,10 +665,6 @@ don't. */ #undef HAVE_DECL_GETDTABLESIZE -/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. - */ -#undef HAVE_DECL_GETENV - /* Define to 1 if you have the declaration of `getline', and to 0 if you don't. */ #undef HAVE_DECL_GETLINE @@ -652,13 +737,10 @@ */ #undef HAVE_DECL_STRDUP -/* Define to 1, since you should have the declaration of strerror_r. */ +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ #undef HAVE_DECL_STRERROR_R -/* Define to 1 if you have the declaration of 'strerror_r' in the system - include files, or to 0 otherwise. */ -#undef HAVE_DECL_STRERROR_R_ORIG - /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you don't. */ #undef HAVE_DECL_STRNCASECMP @@ -1467,6 +1549,9 @@ /* Define to 1 if readlinkat is declared even after undefining macros. */ #undef HAVE_RAW_DECL_READLINKAT +/* Define to 1 if reallocarray is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_REALLOCARRAY + /* Define to 1 if realpath is declared even after undefining macros. */ #undef HAVE_RAW_DECL_REALPATH @@ -1638,6 +1723,9 @@ /* Define to 1 if towctrans is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TOWCTRANS +/* Define to 1 if truncate is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_TRUNCATE + /* Define to 1 if ttyname_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TTYNAME_R @@ -1656,6 +1744,9 @@ /* Define to 1 if usleep is declared even after undefining macros. */ #undef HAVE_RAW_DECL_USLEEP +/* Define to 1 if utime is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_UTIME + /* Define to 1 if utimensat is declared even after undefining macros. */ #undef HAVE_RAW_DECL_UTIMENSAT @@ -1701,6 +1792,9 @@ /* Define to 1 if wcsdup is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSDUP +/* Define to 1 if wcsftime is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSFTIME + /* Define to 1 if wcslen is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSLEN @@ -1878,7 +1972,7 @@ /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define to 1, since you should have the function strerror_r. */ +/* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R /* Define to 1 if you have the header file. */ @@ -1956,10 +2050,6 @@ /* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC -/* Define if struct utimbuf is declared -- usually in . Some systems - have utime.h but don't declare the struct anywhere. */ -#undef HAVE_STRUCT_UTIMBUF - /* Define to 1 if you have the `symlink' function. */ #undef HAVE_SYMLINK @@ -1993,9 +2083,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIMEB_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H @@ -2141,9 +2228,6 @@ /* Define to 1 if you have the `_ftelli64' function. */ #undef HAVE__FTELLI64 -/* Define to 1 if you have the `_ftime' function. */ -#undef HAVE__FTIME - /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER @@ -2204,6 +2288,17 @@ #endif +/* Define if the compilation of mktime.c should define 'mktime_internal'. */ +#undef NEED_MKTIME_INTERNAL + +/* Define if the compilation of mktime.c should define 'mktime' with the + native Windows TZ workaround. */ +#undef NEED_MKTIME_WINDOWS + +/* Define if the compilation of mktime.c should define 'mktime' with the + algorithmic workarounds. */ +#undef NEED_MKTIME_WORKING + /* Define to 1 if open() fails to recognize a trailing slash. */ #undef OPEN_TRAILING_SLASH_BUG @@ -2245,10 +2340,6 @@ 'ptrdiff_t'. */ #undef PTRDIFF_T_SUFFIX -/* Define to 1 if stat needs help when passed a directory name with a trailing - slash */ -#undef REPLACE_FUNC_STAT_DIR - /* Define to 1 if stat needs help when passed a file name with a trailing slash */ #undef REPLACE_FUNC_STAT_FILE @@ -2308,7 +2399,7 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to 0, since strerror_r should not return char *. */ +/* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P /* Define to 1 if time_t is signed. */ @@ -2358,6 +2449,14 @@ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Enable NetBSD extensions on NetBSD. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD extensions on NetBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS @@ -2450,10 +2549,6 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct - stat.st_size becomes 64-bit. */ -#undef _GL_WINDOWS_64_BIT_ST_SIZE - /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ #undef _LARGEFILE_SOURCE @@ -2501,6 +2596,9 @@ /* Define if you want regoff_t to be at least as wide POSIX requires. */ #undef _REGEX_LARGE_OFFSETS +/* For standard stat data types on VMS. */ +#undef _USE_STD_STAT + /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX @@ -2517,7 +2615,7 @@ /* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see - . + . Suppress extern inline with Sun C in standards-conformance mode, as it mishandles inline functions that call each other. E.g., for 'inline void f @@ -2534,16 +2632,16 @@ from calling static functions. This bug is known to occur on: OS X 10.8 and earlier; see: - http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log FreeBSD; see: - http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . + for clang but remains for g++; see . Assume DragonFly and FreeBSD will be similar. */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ diff --git a/src/connect.c b/src/connect.c index d665d6d..37dae21 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1,7 +1,5 @@ /* Establishing and handling network connections. - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1995-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/connect.h b/src/connect.h index 9b08848..fec2405 100644 --- a/src/connect.h +++ b/src/connect.h @@ -1,7 +1,5 @@ /* Declarations for connect. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/convert.c b/src/convert.c index 78cbafb..e6ca8fb 100644 --- a/src/convert.c +++ b/src/convert.c @@ -1,6 +1,6 @@ /* Conversion of links to local files. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, - 2014, 2015 Free Software Foundation, Inc. + Copyright (C) 2003-2011, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/convert.h b/src/convert.h index e3ff6f0..6f45dfb 100644 --- a/src/convert.h +++ b/src/convert.h @@ -1,6 +1,6 @@ /* Declarations for convert.c - Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2003-2006, 2009-2011, 2015, 2018 Free Software + Foundation, Inc. This file is part of GNU Wget. diff --git a/src/cookies.c b/src/cookies.c index e316ea1..ea4c7de 100644 --- a/src/cookies.c +++ b/src/cookies.c @@ -1,6 +1,5 @@ /* Support for cookies. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/cookies.h b/src/cookies.h index b4281e1..e174798 100644 --- a/src/cookies.h +++ b/src/cookies.h @@ -1,6 +1,5 @@ /* Support for cookies. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-tokens.h b/src/css-tokens.h index 316d97f..381dbd9 100644 --- a/src/css-tokens.h +++ b/src/css-tokens.h @@ -1,5 +1,5 @@ /* Declarations for css.lex - Copyright (C) 2006, 2009, 2010, 2011, 2015 Free Software Foundation, + Copyright (C) 2006, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-url.c b/src/css-url.c index 781bbe1..1d973a0 100644 --- a/src/css-url.c +++ b/src/css-url.c @@ -1,6 +1,6 @@ /* Collect URLs from CSS source. - Copyright (C) 1998, 2000, 2001, 2002, 2003, 2009, 2010, 2011, 2014, - 2015 Free Software Foundation, Inc. + Copyright (C) 1998, 2000-2003, 2009-2011, 2014-2015, 2018 Free + Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css-url.h b/src/css-url.h index 92ce6b1..79f1166 100644 --- a/src/css-url.h +++ b/src/css-url.h @@ -1,5 +1,5 @@ /* Declarations for css-url.c. - Copyright (C) 2006, 2009, 2010, 2011, 2015 Free Software Foundation, + Copyright (C) 2006, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css.c b/src/css.c index 4f9a403..7d3e61b 100644 --- a/src/css.c +++ b/src/css.c @@ -1,6 +1,6 @@ -#line 2 "css.c" +#line 1 "css.c" -#line 4 "css.c" +#line 3 "css.c" #define YY_INT_ALIGNED short int @@ -9,7 +9,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -84,10 +84,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -100,32 +106,26 @@ typedef unsigned int flex_uint32_t; /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -162,7 +162,7 @@ extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -179,7 +179,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -261,7 +260,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -282,65 +280,59 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ #define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; @@ -349,10 +341,10 @@ extern char *yytext; #endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yynoreturn yy_fatal_error (yyconst char* msg ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -363,7 +355,6 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 42 #define YY_END_OF_BUFFER 43 /* This struct is not used in this scanner, @@ -373,7 +364,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1153] = +static const flex_int16_t yy_accept[1153] = { 0, 0, 0, 43, 41, 1, 1, 41, 12, 41, 12, 8, 10, 41, 41, 41, 37, 41, 9, 41, 13, @@ -504,7 +495,7 @@ static yyconst flex_int16_t yy_accept[1153] = 0, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 4, 5, 1, 1, 1, 1, 1, 1, 1, @@ -536,7 +527,7 @@ static yyconst YY_CHAR yy_ec[256] = 81, 81, 81, 81, 81 } ; -static yyconst YY_CHAR yy_meta[82] = +static const YY_CHAR yy_meta[82] = { 0, 1, 2, 3, 3, 3, 2, 4, 5, 4, 4, 4, 5, 6, 4, 4, 4, 4, 7, 4, 4, @@ -549,7 +540,7 @@ static yyconst YY_CHAR yy_meta[82] = 9 } ; -static yyconst flex_uint16_t yy_base[1307] = +static const flex_int16_t yy_base[1307] = { 0, 0, 0, 3517,17264, 80, 85, 104, 84, 3459, 81, 17264,17264, 76, 127, 3494, 159, 3501,17264, 200, 82, @@ -697,7 +688,7 @@ static yyconst flex_uint16_t yy_base[1307] = 17209,17218,17227,17236,17245,17254 } ; -static yyconst flex_int16_t yy_def[1307] = +static const flex_int16_t yy_def[1307] = { 0, 1152, 1, 1152, 1152, 1152, 1152, 1152, 1153, 1154, 1155, 1152, 1152, 1156, 1152, 1152, 1152, 1152, 1152, 1152, 1157, @@ -845,7 +836,7 @@ static yyconst flex_int16_t yy_def[1307] = 1152, 1152, 1152, 1152, 1152, 1152 } ; -static yyconst flex_uint16_t yy_nxt[17346] = +static const flex_int16_t yy_nxt[17346] = { 0, 4, 5, 6, 5, 5, 5, 7, 8, 9, 4, 4, 10, 4, 4, 4, 11, 12, 13, 14, 15, @@ -2757,7 +2748,7 @@ static yyconst flex_uint16_t yy_nxt[17346] = 1152, 1152, 1152, 1152, 1152 } ; -static yyconst flex_int16_t yy_chk[17346] = +static const flex_int16_t yy_chk[17346] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -4687,7 +4678,7 @@ char *yytext; #line 7 "css.l" /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009, 2010, 2011, 2015 Free Software Foundation, + Copyright (C) 2006, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -4720,7 +4711,8 @@ as that of the covered work. */ #include "css-tokens.h" -#line 4724 "css.c" +#line 4714 "css.c" +#line 4715 "css.c" #define INITIAL 0 @@ -4736,36 +4728,36 @@ as that of the covered work. */ #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * _in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * _out_str ); +void yyset_out ( FILE * _out_str ); - int yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int _line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -4773,9 +4765,9 @@ void yyset_lineno (int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif @@ -4784,19 +4776,18 @@ extern int yywrap (void ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -4827,7 +4818,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -4840,7 +4831,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -4929,17 +4920,17 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 83 "css.l" -#line 4943 "css.c" +#line 4933 "css.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -4967,9 +4958,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_current_state != 1152 ); @@ -5232,7 +5223,7 @@ YY_RULE_SETUP #line 139 "css.l" ECHO; YY_BREAK -#line 5236 "css.c" +#line 5226 "css.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -5311,7 +5302,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -5443,7 +5434,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ @@ -5475,7 +5467,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -5492,9 +5484,12 @@ static int yy_get_next_buffer (void) if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -5527,9 +5522,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -5555,9 +5550,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 1152); return yy_is_jam ? 0 : yy_current_state; @@ -5591,7 +5586,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -5608,13 +5603,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -5652,11 +5647,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -5684,7 +5679,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -5712,22 +5707,22 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -5746,9 +5741,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -5760,7 +5755,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -5803,7 +5798,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -5834,7 +5829,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -5853,7 +5848,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -5863,7 +5858,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -5920,11 +5915,11 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = NULL; @@ -5934,7 +5929,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -5947,10 +5942,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,(int) strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -5960,7 +5955,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -5969,7 +5964,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) /* Get memory for full buffer, including space for trailing EOB's. */ n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc(n ); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -5978,7 +5973,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -5994,9 +5989,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) #define YY_EXIT_FAILURE 2 #endif -static void yynoreturn yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -6131,7 +6126,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -6152,7 +6147,7 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { int i; @@ -6162,7 +6157,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { int n; for ( n = 0; s[n]; ++n ) @@ -6200,4 +6195,3 @@ void yyfree (void * ptr ) #line 139 "css.l" - diff --git a/src/css.l b/src/css.l index 8b98f27..14c05d5 100644 --- a/src/css.l +++ b/src/css.l @@ -6,7 +6,7 @@ %{ /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009, 2010, 2011, 2015 Free Software Foundation, + Copyright (C) 2006, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/css_.c b/src/css_.c index bde65ad..53d8125 100644 --- a/src/css_.c +++ b/src/css_.c @@ -1,7 +1,7 @@ #include "wget.h" -#line 2 "css.c" +#line 1 "css.c" -#line 4 "css.c" +#line 3 "css.c" #define YY_INT_ALIGNED short int @@ -10,7 +10,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 1 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -85,10 +85,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -101,32 +107,26 @@ typedef unsigned int flex_uint32_t; /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -163,7 +163,7 @@ extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -180,7 +180,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -262,7 +261,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -283,65 +281,59 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ #define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; @@ -350,10 +342,10 @@ extern char *yytext; #endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yynoreturn yy_fatal_error (yyconst char* msg ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -364,7 +356,6 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 42 #define YY_END_OF_BUFFER 43 /* This struct is not used in this scanner, @@ -374,7 +365,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1153] = +static const flex_int16_t yy_accept[1153] = { 0, 0, 0, 43, 41, 1, 1, 41, 12, 41, 12, 8, 10, 41, 41, 41, 37, 41, 9, 41, 13, @@ -505,7 +496,7 @@ static yyconst flex_int16_t yy_accept[1153] = 0, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 4, 5, 1, 1, 1, 1, 1, 1, 1, @@ -537,7 +528,7 @@ static yyconst YY_CHAR yy_ec[256] = 81, 81, 81, 81, 81 } ; -static yyconst YY_CHAR yy_meta[82] = +static const YY_CHAR yy_meta[82] = { 0, 1, 2, 3, 3, 3, 2, 4, 5, 4, 4, 4, 5, 6, 4, 4, 4, 4, 7, 4, 4, @@ -550,7 +541,7 @@ static yyconst YY_CHAR yy_meta[82] = 9 } ; -static yyconst flex_uint16_t yy_base[1307] = +static const flex_int16_t yy_base[1307] = { 0, 0, 0, 3517,17264, 80, 85, 104, 84, 3459, 81, 17264,17264, 76, 127, 3494, 159, 3501,17264, 200, 82, @@ -698,7 +689,7 @@ static yyconst flex_uint16_t yy_base[1307] = 17209,17218,17227,17236,17245,17254 } ; -static yyconst flex_int16_t yy_def[1307] = +static const flex_int16_t yy_def[1307] = { 0, 1152, 1, 1152, 1152, 1152, 1152, 1152, 1153, 1154, 1155, 1152, 1152, 1156, 1152, 1152, 1152, 1152, 1152, 1152, 1157, @@ -846,7 +837,7 @@ static yyconst flex_int16_t yy_def[1307] = 1152, 1152, 1152, 1152, 1152, 1152 } ; -static yyconst flex_uint16_t yy_nxt[17346] = +static const flex_int16_t yy_nxt[17346] = { 0, 4, 5, 6, 5, 5, 5, 7, 8, 9, 4, 4, 10, 4, 4, 4, 11, 12, 13, 14, 15, @@ -2758,7 +2749,7 @@ static yyconst flex_uint16_t yy_nxt[17346] = 1152, 1152, 1152, 1152, 1152 } ; -static yyconst flex_int16_t yy_chk[17346] = +static const flex_int16_t yy_chk[17346] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -4688,7 +4679,7 @@ char *yytext; #line 7 "css.l" /* Lex source for CSS tokenizing. Taken from http://www.w3.org/TR/CSS21/grammar.html#q2 - Copyright (C) 2006, 2009, 2010, 2011, 2015 Free Software Foundation, + Copyright (C) 2006, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -4721,7 +4712,8 @@ as that of the covered work. */ #include "css-tokens.h" -#line 4724 "css.c" +#line 4714 "css.c" +#line 4715 "css.c" #define INITIAL 0 @@ -4737,36 +4729,36 @@ as that of the covered work. */ #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * _in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * _out_str ); +void yyset_out ( FILE * _out_str ); - int yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int _line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -4774,9 +4766,9 @@ void yyset_lineno (int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif @@ -4785,19 +4777,18 @@ extern int yywrap (void ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -4828,7 +4819,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -4841,7 +4832,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -4930,17 +4921,17 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 83 "css.l" -#line 4943 "css.c" +#line 4933 "css.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -4968,9 +4959,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_current_state != 1152 ); @@ -5233,7 +5224,7 @@ YY_RULE_SETUP #line 139 "css.l" ECHO; YY_BREAK -#line 5236 "css.c" +#line 5226 "css.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -5312,7 +5303,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -5444,7 +5435,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ @@ -5476,7 +5468,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -5493,9 +5485,12 @@ static int yy_get_next_buffer (void) if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -5528,9 +5523,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -5556,9 +5551,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 1153 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 1152); return yy_is_jam ? 0 : yy_current_state; @@ -5592,7 +5587,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -5609,13 +5604,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -5653,11 +5648,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -5685,7 +5680,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -5713,22 +5708,22 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -5747,9 +5742,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -5761,7 +5756,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -5804,7 +5799,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -5835,7 +5830,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -5854,7 +5849,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -5864,7 +5859,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -5921,11 +5916,11 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = NULL; @@ -5935,7 +5930,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -5948,10 +5943,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,(int) strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -5961,7 +5956,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; @@ -5970,7 +5965,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) /* Get memory for full buffer, including space for trailing EOB's. */ n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc(n ); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -5979,7 +5974,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -5995,9 +5990,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) #define YY_EXIT_FAILURE 2 #endif -static void yynoreturn yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -6132,7 +6127,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -6153,7 +6148,7 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { int i; @@ -6163,7 +6158,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { int n; for ( n = 0; s[n]; ++n ) @@ -6201,4 +6196,3 @@ void yyfree (void * ptr ) #line 139 "css.l" - diff --git a/src/exits.c b/src/exits.c index 10aa793..da2ac3b 100644 --- a/src/exits.c +++ b/src/exits.c @@ -1,6 +1,5 @@ /* Exit status handling. - Copyright (C) 2009, 2010, 2011, 2012, 2015 Free Software Foundation, - Inc. + Copyright (C) 2009-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/exits.h b/src/exits.h index 1f1a12a..bedfdf4 100644 --- a/src/exits.h +++ b/src/exits.h @@ -1,6 +1,5 @@ /* Exit status related declarations. - Copyright (C) 2009, 2010, 2011, 2012, 2015 Free Software Foundation, - Inc. + Copyright (C) 2009-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp-basic.c b/src/ftp-basic.c index 378374c..4a112c9 100644 --- a/src/ftp-basic.c +++ b/src/ftp-basic.c @@ -1,7 +1,6 @@ /* Basic FTP routines. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/ftp-ls.c b/src/ftp-ls.c index 27addd4..4b33413 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -1,7 +1,5 @@ /* Parsing FTP `ls' output. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp-opie.c b/src/ftp-opie.c index ab40b29..ffd048b 100644 --- a/src/ftp-opie.c +++ b/src/ftp-opie.c @@ -1,6 +1,5 @@ /* Opie (s/key) support for FTP. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ftp.c b/src/ftp.c index a0b3b0b..96527dd 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -1,7 +1,6 @@ /* File Transfer Protocol support. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/ftp.h b/src/ftp.h index f02e377..d30f8d0 100644 --- a/src/ftp.h +++ b/src/ftp.h @@ -1,7 +1,5 @@ /* Declarations for FTP support. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/gnutls.c b/src/gnutls.c index 3a79594..0fd8da8 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1,6 +1,5 @@ /* SSL support via GnuTLS library. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 - Free Software Foundation, Inc. + Copyright (C) 2005-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/hash.c b/src/hash.c index bc74c52..4466c5f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -1,6 +1,5 @@ /* Hash tables. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 2000-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/hash.h b/src/hash.h index 419ae41..ae0e8e4 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,6 +1,6 @@ /* Hash table declarations. - Copyright (C) 2000, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 2000, 2007-2011, 2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/host.c b/src/host.c index ccc6349..d337cc7 100644 --- a/src/host.c +++ b/src/host.c @@ -1,7 +1,5 @@ /* Host name resolution and matching. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1019,18 +1017,25 @@ sufmatch (const char **list, const char *what) int i, j, k, lw; lw = strlen (what); + for (i = 0; list[i]; i++) { - if (list[i][0] == '\0') - continue; + j = strlen (list[i]); + if (lw < j) + continue; /* what is no (sub)domain of list[i] */ - for (j = strlen (list[i]), k = lw; j >= 0 && k >= 0; j--, k--) + for (k = lw; j >= 0 && k >= 0; j--, k--) if (c_tolower (list[i][j]) != c_tolower (what[k])) break; - /* The domain must be first to reach to beginning. */ - if (j == -1) + + /* Domain or subdomain match + * k == -1: exact match + * k >= 0 && what[k] == '.': subdomain match + */ + if (j == -1 && (k == -1 || what[k] == '.')) return true; } + return false; } diff --git a/src/host.h b/src/host.h index 785a570..042d44d 100644 --- a/src/host.h +++ b/src/host.h @@ -1,7 +1,5 @@ /* Declarations for host.c - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/hsts.c b/src/hsts.c index 257d4e5..e449a9f 100644 --- a/src/hsts.c +++ b/src/hsts.c @@ -1,7 +1,5 @@ /* HTTP Strict Transport Security (HSTS) support. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/hsts.h b/src/hsts.h index 6e5bbc8..257f0b0 100644 --- a/src/hsts.h +++ b/src/hsts.h @@ -1,7 +1,5 @@ /* Declarations for hsts.c - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-parse.c b/src/html-parse.c index c14d73a..658f90f 100644 --- a/src/html-parse.c +++ b/src/html-parse.c @@ -1,6 +1,5 @@ /* HTML parser for Wget. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-parse.h b/src/html-parse.h index 829ed69..567afcd 100644 --- a/src/html-parse.h +++ b/src/html-parse.h @@ -1,6 +1,5 @@ /* Declarations for html-parse.c. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-url.c b/src/html-url.c index 98502dd..dd87899 100644 --- a/src/html-url.c +++ b/src/html-url.c @@ -1,7 +1,5 @@ /* Collect URLs from HTML source. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software Foundation, - Inc. + Copyright (C) 1998-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/html-url.h b/src/html-url.h index 5ee7193..a3ca43c 100644 --- a/src/html-url.h +++ b/src/html-url.h @@ -1,5 +1,5 @@ /* Declarations for html-url.c. - Copyright (C) 1995, 1996, 1997, 2009, 2010, 2011, 2015 Free Software + Copyright (C) 1995-1997, 2009-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/http-ntlm.c b/src/http-ntlm.c index 72f6fcd..a614fba 100644 --- a/src/http-ntlm.c +++ b/src/http-ntlm.c @@ -1,6 +1,5 @@ /* NTLM code. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. Contributed by Daniel Stenberg. This file is part of GNU Wget. diff --git a/src/http-ntlm.h b/src/http-ntlm.h index 8922f12..39a23b5 100644 --- a/src/http-ntlm.h +++ b/src/http-ntlm.h @@ -1,8 +1,8 @@ #ifndef __HTTP_NTLM_H #define __HTTP_NTLM_H /* Declarations for http_ntlm.c - Copyright (C) 1995, 1996, 1997, 2000, 2007, 2008, 2009, 2010, 2011, - 2015 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000, 2007-2011, 2015, 2018 Free Software + Foundation, Inc. Contributed by Daniel Stenberg. This file is part of GNU Wget. diff --git a/src/http.c b/src/http.c index dc31823..1cd2768 100644 --- a/src/http.c +++ b/src/http.c @@ -1,7 +1,6 @@ /* HTTP support. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2015 Free - Software Foundation, Inc. + Copyright (C) 1996-2012, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -104,7 +103,8 @@ static struct cookie_jar *wget_cookie_jar; #define H_REDIRECTED(x) ((x) == HTTP_STATUS_MOVED_PERMANENTLY \ || (x) == HTTP_STATUS_MOVED_TEMPORARILY \ || (x) == HTTP_STATUS_SEE_OTHER \ - || (x) == HTTP_STATUS_TEMPORARY_REDIRECT) + || (x) == HTTP_STATUS_TEMPORARY_REDIRECT \ + || (x) == HTTP_STATUS_PERMANENT_REDIRECT) /* HTTP/1.0 status codes from RFC1945, provided for reference. */ /* Successful 2xx. */ @@ -121,6 +121,7 @@ static struct cookie_jar *wget_cookie_jar; #define HTTP_STATUS_SEE_OTHER 303 /* from HTTP/1.1 */ #define HTTP_STATUS_NOT_MODIFIED 304 #define HTTP_STATUS_TEMPORARY_REDIRECT 307 /* from HTTP/1.1 */ +#define HTTP_STATUS_PERMANENT_REDIRECT 308 /* from HTTP/1.1 */ /* Client error 4xx. */ #define HTTP_STATUS_BAD_REQUEST 400 @@ -1867,7 +1868,7 @@ initialize_request (const struct url *u, struct http_stat *hs, int *dt, struct u if (*dt & SEND_NOCACHE) { /* Cache-Control MUST be obeyed by all HTTP/1.1 caching mechanisms... */ - request_set_header (req, "Cache-Control", "no-cache, must-revalidate", rel_none); + request_set_header (req, "Cache-Control", "no-cache", rel_none); /* ... but some HTTP/1.0 caches doesn't implement Cache-Control. */ request_set_header (req, "Pragma", "no-cache", rel_none); @@ -3711,23 +3712,41 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, else if (hs->local_encoding == ENC_GZIP && opt.compression != compression_none) { + const char *p; + /* Make sure the Content-Type is not gzip before decompressing */ - const char * p = strchr (type, '/'); - if (p == NULL) - { - hs->remote_encoding = ENC_GZIP; - hs->local_encoding = ENC_NONE; - } - else + if (type) { - p++; - if (c_tolower(p[0]) == 'x' && p[1] == '-') - p += 2; - if (0 != c_strcasecmp (p, "gzip")) + const char * p = strchr (type, '/'); + if (p == NULL) { hs->remote_encoding = ENC_GZIP; hs->local_encoding = ENC_NONE; } + else + { + p++; + if (c_tolower(p[0]) == 'x' && p[1] == '-') + p += 2; + if (0 != c_strcasecmp (p, "gzip")) + { + hs->remote_encoding = ENC_GZIP; + hs->local_encoding = ENC_NONE; + } + } + } + else + { + hs->remote_encoding = ENC_GZIP; + hs->local_encoding = ENC_NONE; + } + + /* don't uncompress if a file ends with '.gz' or '.tgz' */ + if (hs->remote_encoding == ENC_GZIP + && (p = strrchr(u->file, '.')) + && (c_strcasecmp(p, ".gz") || c_strcasecmp(p, ".tgz"))) + { + hs->remote_encoding = ENC_NONE; } } #endif @@ -3821,6 +3840,7 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, switch (statcode) { case HTTP_STATUS_TEMPORARY_REDIRECT: + case HTTP_STATUS_PERMANENT_REDIRECT: retval = NEWLOCATION_KEEP_POST; goto cleanup; case HTTP_STATUS_MOVED_PERMANENTLY: @@ -3843,8 +3863,6 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, } } - set_content_type (dt, type); - if (cond_get) { if (statcode == HTTP_STATUS_NOT_MODIFIED) @@ -3859,6 +3877,8 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, } } + set_content_type (dt, type); + if (opt.adjust_extension) { const char *encoding_ext = NULL; @@ -3958,11 +3978,16 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, hs->res = 0; /* Mark as successfully retrieved. */ *dt |= RETROKF; - if (statcode == HTTP_STATUS_RANGE_NOT_SATISFIABLE) + + /* Try to maintain the keep-alive connection. It is often cheaper to + * consume some bytes which have already been sent than to negotiate + * a new connection. However, if the body is too large, or we don't + * care about keep-alive, then simply terminate the connection */ + if (keep_alive && + skip_short_body (sock, contlen, chunked_transfer_encoding)) CLOSE_FINISH (sock); else - CLOSE_INVALIDATE (sock); /* would be CLOSE_FINISH, but there - might be more bytes in the body. */ + CLOSE_INVALIDATE (sock); retval = RETRUNNEEDED; goto cleanup; } diff --git a/src/http.h b/src/http.h index 1e8218f..f9ab352 100644 --- a/src/http.h +++ b/src/http.h @@ -1,6 +1,5 @@ /* Declarations for HTTP. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/init.c b/src/init.c index 1064883..5c6fb7d 100644 --- a/src/init.c +++ b/src/init.c @@ -1,7 +1,6 @@ /* Reading/parsing the initialization file. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2015 Free - Software Foundation, Inc. + Copyright (C) 1996-2012, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/init.h b/src/init.h index a57ca78..58532b3 100644 --- a/src/init.h +++ b/src/init.h @@ -1,7 +1,5 @@ /* Declarations for init.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/iri.c b/src/iri.c index af0dfb6..ef51044 100644 --- a/src/iri.c +++ b/src/iri.c @@ -1,6 +1,5 @@ /* IRI related functions. - Copyright (C) 2008, 2009, 2010, 2011, 2015 Free Software Foundation, - Inc. + Copyright (C) 2008-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/iri.h b/src/iri.h index fb994ee..4c50184 100644 --- a/src/iri.h +++ b/src/iri.h @@ -1,6 +1,5 @@ /* Internationalization related declarations. - Copyright (C) 2008, 2009, 2010, 2011, 2015 Free Software Foundation, - Inc. + Copyright (C) 2008-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/log.c b/src/log.c index 6f9b0c7..5bff9c2 100644 --- a/src/log.c +++ b/src/log.c @@ -1,6 +1,5 @@ /* Messages logging. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -344,7 +343,9 @@ get_warc_log_fp (void) return NULL; if (warclogfp) return warclogfp; - return NULL; + if (logfp) + return NULL; + return stderr; } /* Sets the file descriptor for the secondary log file. */ @@ -962,7 +963,9 @@ check_redirect_output (void) * we check if process is fg or bg before every line is printed.*/ if (!redirect_request_signal_name && shell_is_interactive && !opt.lfilename) { - if (tcgetpgrp (STDIN_FILENO) != getpgrp ()) + pid_t foreground_pgrp = tcgetpgrp (STDIN_FILENO); + + if (foreground_pgrp != -1 && foreground_pgrp != getpgrp ()) { /* Process backgrounded */ redirect_output (true,NULL); diff --git a/src/log.h b/src/log.h index c3b7fec..e8bd065 100644 --- a/src/log.h +++ b/src/log.h @@ -1,6 +1,5 @@ /* Declarations for log.c. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 1998-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/main.c b/src/main.c index f9759c3..8382ab0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,5 @@ /* Command line parsing. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free - Software Foundation, Inc. + Copyright (C) 1996-2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -37,7 +35,7 @@ as that of the covered work. */ #include #include #include -#ifdef ENABLE_NLS +#if defined(ENABLE_NLS) || defined(WINDOWS) # include #endif #include @@ -74,6 +72,9 @@ as that of the covered work. */ #ifdef WINDOWS # include # include +#ifndef ENABLE_NLS +# include +#endif #endif #ifdef __VMS @@ -148,6 +149,14 @@ i18n_initialize (void) /* Set the text message domain. */ bindtextdomain ("wget", LOCALEDIR); textdomain ("wget"); +#elif defined WINDOWS + char MBCP[16] = ""; + int CP; + + CP = _getmbcp(); /* Consider it's different from default. */ + if (CP > 0) + snprintf(MBCP, sizeof(MBCP), ".%d", CP); + setlocale(LC_ALL, MBCP); #endif /* ENABLE_NLS */ } @@ -1529,6 +1538,9 @@ main (int argc, char **argv) nurl = argc - optind; + /* Initialize logging ASAP. */ + log_init (opt.lfilename, append_to_log); + /* If we do not have Debug support compiled in AND Wget is invoked with the * --debug switch, instead of failing, we silently turn it into a no-op. For * this no-op, we explicitly set opt.debug to false and hence none of the @@ -1634,8 +1646,8 @@ for details.\n\n")); { /* Check if output file exists; if it does, exit. */ logprintf (LOG_VERBOSE, - _("File `%s' already there; not retrieving.\n"), - opt.output_document); + _("File %s already there; not retrieving.\n"), + quote (opt.output_document)); exit (WGET_EXIT_GENERIC_ERROR); } } @@ -1892,9 +1904,6 @@ for details.\n\n")); } url[i] = NULL; - /* Initialize logging. */ - log_init (opt.lfilename, append_to_log); - /* Open WARC file. */ if (opt.warc_filename != 0) warc_init (); diff --git a/src/metalink.c b/src/metalink.c index f11b7c1..93cc615 100644 --- a/src/metalink.c +++ b/src/metalink.c @@ -1,5 +1,5 @@ /* Metalink module. - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/metalink.h b/src/metalink.h index 2a8481d..00ff4c4 100644 --- a/src/metalink.h +++ b/src/metalink.h @@ -1,5 +1,5 @@ /* Declarations for metalink.c. - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/mswindows.c b/src/mswindows.c index f7e03bd..2ce9150 100644 --- a/src/mswindows.c +++ b/src/mswindows.c @@ -1,7 +1,6 @@ /* mswindows.c -- Windows-specific support - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/mswindows.h b/src/mswindows.h index 1bc2e21..17f647f 100644 --- a/src/mswindows.h +++ b/src/mswindows.h @@ -1,7 +1,5 @@ /* Declarations for windows - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/netrc.c b/src/netrc.c index 6375b66..7001739 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -1,6 +1,6 @@ /* Read and parse the .netrc file to get hosts, accounts, and passwords. - Copyright (C) 1996, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996, 2007-2011, 2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -42,7 +42,11 @@ as that of the covered work. */ #include "netrc.h" #include "init.h" -#define NETRC_FILE_NAME ".netrc" +#ifdef WINDOWS +# define NETRC_FILE_NAME "_netrc" +#else +# define NETRC_FILE_NAME ".netrc" +#endif static acc_t *netrc_list; @@ -457,6 +461,9 @@ free_netrc(acc_t *l) #ifdef STANDALONE #include #include +#include "exits.h" + +const char *program_argstring = NULL; /* Needed by warc.c */ int main (int argc, char **argv) diff --git a/src/netrc.h b/src/netrc.h index 2432001..045b522 100644 --- a/src/netrc.h +++ b/src/netrc.h @@ -1,6 +1,6 @@ /* Declarations for netrc.c - Copyright (C) 1996, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 - Free Software Foundation, Inc. + Copyright (C) 1996, 1996-1997, 2007-2011, 2015, 2018 Free Software + Foundation, Inc. This file is part of GNU Wget. diff --git a/src/openssl.c b/src/openssl.c index 0404d2d..6af38db 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -1,6 +1,5 @@ /* SSL support via OpenSSL library. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc. + Copyright (C) 2000-2012, 2015, 2018 Free Software Foundation, Inc. Originally contributed by Christian Fraenkel. This file is part of GNU Wget. @@ -174,11 +173,16 @@ ssl_init (void) { SSL_METHOD const *meth; long ssl_options = 0; +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + int ssl_proto_version = 0; +#endif #if OPENSSL_VERSION_NUMBER >= 0x00907000 if (ssl_true_initialized == 0) { +#if OPENSSL_API_COMPAT < 0x10100000L OPENSSL_config (NULL); +#endif ssl_true_initialized = 1; } #endif @@ -202,8 +206,12 @@ ssl_init (void) CONF_modules_load_file(NULL, NULL, CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); #endif +#if OPENSSL_API_COMPAT >= 0x10100000L + OPENSSL_init_ssl(0, NULL); +#else SSL_library_init (); SSL_load_error_strings (); +#endif #if OPENSSL_VERSION_NUMBER < 0x10100000L SSLeay_add_all_algorithms (); SSLeay_add_ssl_algorithms (); @@ -229,16 +237,31 @@ ssl_init (void) ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; break; case secure_protocol_tlsv1: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_VERSION; +#else meth = TLSv1_client_method (); +#endif break; #if OPENSSL_VERSION_NUMBER >= 0x10001000 case secure_protocol_tlsv1_1: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_1_VERSION; +#else meth = TLSv1_1_client_method (); +#endif break; case secure_protocol_tlsv1_2: +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + meth = TLS_client_method(); + ssl_proto_version = TLS1_2_VERSION; +#else meth = TLSv1_2_client_method (); +#endif break; #else case secure_protocol_tlsv1_1: @@ -265,6 +288,11 @@ ssl_init (void) if (ssl_options) SSL_CTX_set_options (ssl_ctx, ssl_options); +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (ssl_proto_version) + SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version); +#endif + /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more) */ diff --git a/src/options.h b/src/options.h index cf945c1..2e8c874 100644 --- a/src/options.h +++ b/src/options.h @@ -1,7 +1,5 @@ /* struct options. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/progress.c b/src/progress.c index 36037df..3d8ba53 100644 --- a/src/progress.c +++ b/src/progress.c @@ -1,6 +1,5 @@ /* Download progress. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/progress.h b/src/progress.h index 3fbe197..ffd3afe 100644 --- a/src/progress.h +++ b/src/progress.h @@ -1,6 +1,5 @@ /* Download progress. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ptimer.c b/src/ptimer.c index 17ce678..860d058 100644 --- a/src/ptimer.c +++ b/src/ptimer.c @@ -1,6 +1,5 @@ /* Portable timers. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ptimer.h b/src/ptimer.h index 49234cc..e7d23d2 100644 --- a/src/ptimer.h +++ b/src/ptimer.h @@ -1,6 +1,5 @@ /* Declarations for ptimer.c. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/recur.c b/src/recur.c index 1b25662..1957f00 100644 --- a/src/recur.c +++ b/src/recur.c @@ -1,7 +1,5 @@ /* Handling of recursive HTTP retrieving. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/recur.h b/src/recur.h index 1103948..1c56811 100644 --- a/src/recur.h +++ b/src/recur.h @@ -1,7 +1,5 @@ /* Declarations for recur.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/res.c b/src/res.c index fd2a3cd..353be8a 100644 --- a/src/res.c +++ b/src/res.c @@ -1,6 +1,6 @@ /* Support for Robot Exclusion Standard (RES). - Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2001, 2006-2011, 2015, 2018 Free Software Foundation, + Inc. This file is part of Wget. diff --git a/src/res.h b/src/res.h index 1d4986d..e8fb934 100644 --- a/src/res.h +++ b/src/res.h @@ -1,6 +1,6 @@ /* Declarations for res.c. - Copyright (C) 2001, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 2001, 2007-2011, 2015, 2018 Free Software Foundation, + Inc. This file is part of Wget. diff --git a/src/retr.c b/src/retr.c index 6555ed4..17ed228 100644 --- a/src/retr.c +++ b/src/retr.c @@ -1,7 +1,6 @@ /* File retrieval. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2014-2015, 2018 Free Software Foundation, + Inc. This file is part of GNU Wget. diff --git a/src/retr.h b/src/retr.h index f133c83..dcae7b1 100644 --- a/src/retr.h +++ b/src/retr.h @@ -1,7 +1,5 @@ /* Declarations for retr.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/ssl.h b/src/ssl.h index eeb6b34..a44bd08 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,6 +1,5 @@ /* SSL support. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc. + Copyright (C) 2000-2012, 2015, 2018 Free Software Foundation, Inc. Originally contributed by Christian Fraenkel. This file is part of GNU Wget. diff --git a/src/sysdep.h b/src/sysdep.h index 8bc3d93..bfeadf3 100644 --- a/src/sysdep.h +++ b/src/sysdep.h @@ -1,7 +1,5 @@ /* Dirty system-dependent hacks. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/test.c b/src/test.c index cb01de3..083ea0e 100644 --- a/src/test.c +++ b/src/test.c @@ -1,6 +1,5 @@ /* Unit testing. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/test.h b/src/test.h index 4e0e1f2..7455212 100644 --- a/src/test.h +++ b/src/test.h @@ -1,6 +1,5 @@ /* Unit testing declarations. - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 2005-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/url.c b/src/url.c index 5e01860..0ce5388 100644 --- a/src/url.c +++ b/src/url.c @@ -1,7 +1,5 @@ /* URL handling. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -1708,35 +1706,43 @@ url_file_name (const struct url *u, char *replaced_filename) /* If "dirstruct" is turned on (typically the case with -r), add the host and port (unless those have been turned off) and directory structure. */ + /* All safe remote chars are unescaped and stored in temp_fnres, + then converted to local and appended to fnres. + Internationalized URL/IDN will produce punycode to lookup IP from DNS: + https://en.wikipedia.org/wiki/URL + https://en.wikipedia.org/wiki/Internationalized_domain_name + Non-ASCII code chars in the path: + https://en.wikipedia.org/wiki/List_of_Unicode_characters + https://en.wikipedia.org/wiki/List_of_writing_systems */ if (opt.dirstruct) { if (opt.protocol_directories) { - if (fnres.tail) - append_char ('/', &fnres); - append_string (supported_schemes[u->scheme].name, &fnres); + if (temp_fnres.tail) + append_char ('/', &temp_fnres); + append_string (supported_schemes[u->scheme].name, &temp_fnres); } if (opt.add_hostdir) { - if (fnres.tail) - append_char ('/', &fnres); + if (temp_fnres.tail) + append_char ('/', &temp_fnres); if (0 != strcmp (u->host, "..")) - append_string (u->host, &fnres); + append_string (u->host, &temp_fnres); else /* Host name can come from the network; malicious DNS may allow ".." to be resolved, causing us to write to "../". Defang such host names. */ - append_string ("%2E%2E", &fnres); + append_string ("%2E%2E", &temp_fnres); if (u->port != scheme_default_port (u->scheme)) { char portstr[24]; number_to_string (portstr, u->port); - append_char (FN_PORT_SEP, &fnres); - append_string (portstr, &fnres); + append_char (FN_PORT_SEP, &temp_fnres); + append_string (portstr, &temp_fnres); } } - append_dir_structure (u, &fnres); + append_dir_structure (u, &temp_fnres); } if (!replaced_filename) @@ -1750,9 +1756,6 @@ url_file_name (const struct url *u, char *replaced_filename) fname_len_check = concat_strings (u_file, FN_QUERY_SEP_STR, u->query, NULL); else fname_len_check = strdupdelim (u_file, u_file + strlen (u_file)); - - /* convert before concat with local path */ - fname_len_check = convert_fname (fname_len_check); } else { @@ -1760,12 +1763,23 @@ url_file_name (const struct url *u, char *replaced_filename) fname_len_check = strdupdelim (u_file, u_file + strlen (u_file)); } + if (temp_fnres.tail) + append_char ('/', &temp_fnres); + append_uri_pathel (fname_len_check, - fname_len_check + strlen (fname_len_check), false, &temp_fnres); + fname_len_check + strlen (fname_len_check), true, &temp_fnres); /* Zero-terminate the temporary file name. */ append_char ('\0', &temp_fnres); + /* convert all remote chars before length check and appending to local path */ + fname = convert_fname (temp_fnres.base); + temp_fnres.base = NULL; + temp_fnres.size = 0; + temp_fnres.tail = 0; + append_string (fname, &temp_fnres); + xfree (fname); + /* Check that the length of the file name is acceptable. */ #ifdef WINDOWS if (MAX_PATH > (fnres.tail + CHOMP_BUFFER + 2)) diff --git a/src/url.h b/src/url.h index ad58739..fb66a76 100644 --- a/src/url.h +++ b/src/url.h @@ -1,7 +1,5 @@ /* Declarations for url.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/utils.c b/src/utils.c index 81f2801..6f41fab 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,5 @@ /* Various utility functions. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -49,10 +47,7 @@ as that of the covered work. */ #if HAVE_UTIME # include -# ifdef HAVE_UTIME_H -# include -# endif - +# include # ifdef HAVE_SYS_UTIME_H # include # endif @@ -2819,7 +2814,7 @@ wg_pin_peer_pubkey (const char *pinnedpubkey, const char *pubkey, size_t pubkeyl } else logprintf (LOG_VERBOSE, _ ("Skipping key with wrong size (%d/%d): %s\n"), - (strlen (begin_pos + 8) * 3) / 4, SHA256_DIGEST_SIZE, + (int) (strlen (begin_pos + 8) * 3) / 4, SHA256_DIGEST_SIZE, quote (begin_pos + 8)); /* diff --git a/src/utils.h b/src/utils.h index 9936d97..66838f2 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,5 @@ /* Declarations for utils.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/version.h b/src/version.h index 46e235a..aeae086 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* Extern declarations for printing version information - Copyright (C) 2013, 2015 Free Software Foundation, Inc. + Copyright (C) 2013, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/warc.c b/src/warc.c index 6a4b9eb..9cbbca3 100644 --- a/src/warc.c +++ b/src/warc.c @@ -1,5 +1,5 @@ /* Utility functions for writing WARC files. - Copyright (C) 2011, 2012, 2015 Free Software Foundation, Inc. + Copyright (C) 2011-2012, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/wget.h b/src/wget.h index ed57245..9115bb1 100644 --- a/src/wget.h +++ b/src/wget.h @@ -1,7 +1,5 @@ /* Miscellaneous declarations. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software - Foundation, Inc. + Copyright (C) 1996-2011, 2015, 2018 Free Software Foundation, Inc. This file is part of GNU Wget. diff --git a/src/xattr.c b/src/xattr.c index f2b208a..6652422 100644 --- a/src/xattr.c +++ b/src/xattr.c @@ -1,6 +1,6 @@ /* xattr.h -- POSIX Extended Attribute support. - Copyright (C) 2016 Free Software Foundation, Inc. + Copyright (C) 2016, 2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/xattr.h b/src/xattr.h index 0488a39..10f3ed1 100644 --- a/src/xattr.h +++ b/src/xattr.h @@ -1,6 +1,6 @@ /* xattr.h -- POSIX Extended Attribute function mappings. - Copyright (C) 2016 Free Software Foundation, Inc. + Copyright (C) 2016, 2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/testenv/Makefile.am b/testenv/Makefile.am index ef4158a..36639fa 100644 --- a/testenv/Makefile.am +++ b/testenv/Makefile.am @@ -1,5 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 2013, 2015 Free Software Foundation, Inc. +# Copyright (C) 2013, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -73,6 +73,7 @@ endif if HAVE_PYTHON3 TESTS = Test-504.py \ + Test-416.py \ Test-auth-basic-fail.py \ Test-auth-basic.py \ Test-auth-basic-netrc.py \ diff --git a/testenv/Makefile.in b/testenv/Makefile.in index c23030e..81d946e 100644 --- a/testenv/Makefile.in +++ b/testenv/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 2013, 2015 Free Software Foundation, Inc. +# Copyright (C) 2013, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -114,8 +114,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @WITH_SSL_TRUE@am__append_1 = export SSL_TESTS=1; -@HAVE_PYTHON3_TRUE@TESTS = Test-504.py Test-auth-basic-fail.py \ -@HAVE_PYTHON3_TRUE@ Test-auth-basic.py Test-auth-basic-netrc.py \ +@HAVE_PYTHON3_TRUE@TESTS = Test-504.py Test-416.py \ +@HAVE_PYTHON3_TRUE@ Test-auth-basic-fail.py Test-auth-basic.py \ +@HAVE_PYTHON3_TRUE@ Test-auth-basic-netrc.py \ @HAVE_PYTHON3_TRUE@ Test-auth-basic-netrc-user-given.py \ @HAVE_PYTHON3_TRUE@ Test-auth-basic-netrc-pass-given.py \ @HAVE_PYTHON3_TRUE@ Test-auth-basic-no-netrc-fail.py \ @@ -179,7 +180,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -195,28 +197,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -254,17 +257,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -573,6 +577,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -589,6 +594,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -596,6 +602,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -668,6 +675,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -713,6 +721,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -761,6 +770,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -797,6 +807,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -820,7 +831,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -828,6 +841,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -851,6 +865,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -891,6 +906,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -913,12 +929,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -939,6 +957,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -1032,6 +1051,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -1086,13 +1106,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -1109,6 +1133,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1139,6 +1164,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1173,6 +1200,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1244,6 +1272,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1277,6 +1306,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1315,10 +1345,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1427,6 +1459,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1443,11 +1476,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1456,6 +1492,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1486,6 +1523,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1493,6 +1531,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1503,7 +1543,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/testenv/Test-416.py b/testenv/Test-416.py new file mode 100755 index 0000000..76b9421 --- /dev/null +++ b/testenv/Test-416.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 +from sys import exit +from test.http_test import HTTPTest +from misc.wget_file import WgetFile + +""" + Ensure that Wget behaves well when the server responds with a HTTP 416 + status code. This test checks both cases: + 1. Server sends no body + 2. Server sends a body +""" +############# File Definitions ############################################### +File1 = "abababababababababababababababababababababababababababababababababab" +File2 = "ababababababababababababababababababab" + +A_File = WgetFile ("File1", File1) +B_File = WgetFile ("File1", File1) + +C_File = WgetFile ("File2", File2) +D_File = WgetFile ("File2", File1) + +E_File = WgetFile ("File3", File1) + +WGET_OPTIONS = "-c" +WGET_URLS = [["File1", "File2", "File3"]] + +Files = [[A_File, C_File, E_File]] +Existing_Files = [B_File, D_File] + +ExpectedReturnCode = 0 +ExpectedDownloadedFiles = [B_File, D_File, E_File] + +################ Pre and Post Test Hooks ##################################### +pre_test = { + "ServerFiles" : Files, + "LocalFiles" : Existing_Files +} +test_options = { + "WgetCommands" : WGET_OPTIONS, + "Urls" : WGET_URLS +} +post_test = { + "ExpectedFiles" : ExpectedDownloadedFiles, + "ExpectedRetcode" : ExpectedReturnCode +} + +err = HTTPTest ( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test +).begin () + +exit (err) diff --git a/testenv/conf/__pycache__/__init__.cpython-34.pyc b/testenv/conf/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index b151961..0000000 Binary files a/testenv/conf/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/__init__.cpython-34.pyo b/testenv/conf/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index b151961..0000000 Binary files a/testenv/conf/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index e1dca51..0000000 Binary files a/testenv/conf/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/__init__.cpython-35.pyc b/testenv/conf/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 3860ae8..0000000 Binary files a/testenv/conf/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index ae78a18..0000000 Binary files a/testenv/conf/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/authentication.cpython-34.pyc b/testenv/conf/__pycache__/authentication.cpython-34.pyc deleted file mode 100644 index 39d68bd..0000000 Binary files a/testenv/conf/__pycache__/authentication.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/authentication.cpython-34.pyo b/testenv/conf/__pycache__/authentication.cpython-34.pyo deleted file mode 100644 index dfeff99..0000000 Binary files a/testenv/conf/__pycache__/authentication.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc deleted file mode 100644 index 7f25a44..0000000 Binary files a/testenv/conf/__pycache__/authentication.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/authentication.cpython-35.pyc b/testenv/conf/__pycache__/authentication.cpython-35.pyc deleted file mode 100644 index 2d4676b..0000000 Binary files a/testenv/conf/__pycache__/authentication.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc deleted file mode 100644 index 68fab16..0000000 Binary files a/testenv/conf/__pycache__/authentication.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/domains.cpython-34.pyc b/testenv/conf/__pycache__/domains.cpython-34.pyc deleted file mode 100644 index 3c1f014..0000000 Binary files a/testenv/conf/__pycache__/domains.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/domains.cpython-34.pyo b/testenv/conf/__pycache__/domains.cpython-34.pyo deleted file mode 100644 index 3c1f014..0000000 Binary files a/testenv/conf/__pycache__/domains.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc deleted file mode 100644 index 22a1e57..0000000 Binary files a/testenv/conf/__pycache__/domains.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/domains.cpython-35.pyc b/testenv/conf/__pycache__/domains.cpython-35.pyc deleted file mode 100644 index c91c39a..0000000 Binary files a/testenv/conf/__pycache__/domains.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc deleted file mode 100644 index ea1df42..0000000 Binary files a/testenv/conf/__pycache__/domains.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expect_header.cpython-34.pyc b/testenv/conf/__pycache__/expect_header.cpython-34.pyc deleted file mode 100644 index a0d7637..0000000 Binary files a/testenv/conf/__pycache__/expect_header.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expect_header.cpython-34.pyo b/testenv/conf/__pycache__/expect_header.cpython-34.pyo deleted file mode 100644 index a0d7637..0000000 Binary files a/testenv/conf/__pycache__/expect_header.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc deleted file mode 100644 index 0339d5d..0000000 Binary files a/testenv/conf/__pycache__/expect_header.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expect_header.cpython-35.pyc b/testenv/conf/__pycache__/expect_header.cpython-35.pyc deleted file mode 100644 index 293272d..0000000 Binary files a/testenv/conf/__pycache__/expect_header.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc deleted file mode 100644 index 091e4a8..0000000 Binary files a/testenv/conf/__pycache__/expect_header.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_files.cpython-34.pyc b/testenv/conf/__pycache__/expected_files.cpython-34.pyc deleted file mode 100644 index 544ec11..0000000 Binary files a/testenv/conf/__pycache__/expected_files.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_files.cpython-34.pyo b/testenv/conf/__pycache__/expected_files.cpython-34.pyo deleted file mode 100644 index 544ec11..0000000 Binary files a/testenv/conf/__pycache__/expected_files.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc deleted file mode 100644 index eb02fab..0000000 Binary files a/testenv/conf/__pycache__/expected_files.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_files.cpython-35.pyc b/testenv/conf/__pycache__/expected_files.cpython-35.pyc deleted file mode 100644 index 3db84db..0000000 Binary files a/testenv/conf/__pycache__/expected_files.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc deleted file mode 100644 index 9e120fe..0000000 Binary files a/testenv/conf/__pycache__/expected_files.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc b/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc deleted file mode 100644 index 6e82a69..0000000 Binary files a/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo b/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo deleted file mode 100644 index 6e82a69..0000000 Binary files a/testenv/conf/__pycache__/expected_ret_code.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc deleted file mode 100644 index 61b40e0..0000000 Binary files a/testenv/conf/__pycache__/expected_ret_code.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc b/testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc deleted file mode 100644 index 7c131b1..0000000 Binary files a/testenv/conf/__pycache__/expected_ret_code.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc deleted file mode 100644 index 48132ce..0000000 Binary files a/testenv/conf/__pycache__/expected_ret_code.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/files_crawled.cpython-34.pyc b/testenv/conf/__pycache__/files_crawled.cpython-34.pyc deleted file mode 100644 index 5c4e9b6..0000000 Binary files a/testenv/conf/__pycache__/files_crawled.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/files_crawled.cpython-34.pyo b/testenv/conf/__pycache__/files_crawled.cpython-34.pyo deleted file mode 100644 index 5c4e9b6..0000000 Binary files a/testenv/conf/__pycache__/files_crawled.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc deleted file mode 100644 index f5fdb1d..0000000 Binary files a/testenv/conf/__pycache__/files_crawled.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/files_crawled.cpython-35.pyc b/testenv/conf/__pycache__/files_crawled.cpython-35.pyc deleted file mode 100644 index 61e6484..0000000 Binary files a/testenv/conf/__pycache__/files_crawled.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc deleted file mode 100644 index 1cd9f5b..0000000 Binary files a/testenv/conf/__pycache__/files_crawled.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/hook_sample.cpython-34.pyc b/testenv/conf/__pycache__/hook_sample.cpython-34.pyc deleted file mode 100644 index 174ba72..0000000 Binary files a/testenv/conf/__pycache__/hook_sample.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/hook_sample.cpython-34.pyo b/testenv/conf/__pycache__/hook_sample.cpython-34.pyo deleted file mode 100644 index 174ba72..0000000 Binary files a/testenv/conf/__pycache__/hook_sample.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc deleted file mode 100644 index 50867b8..0000000 Binary files a/testenv/conf/__pycache__/hook_sample.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/hook_sample.cpython-35.pyc b/testenv/conf/__pycache__/hook_sample.cpython-35.pyc deleted file mode 100644 index 4c03a5d..0000000 Binary files a/testenv/conf/__pycache__/hook_sample.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc deleted file mode 100644 index 6f78dac..0000000 Binary files a/testenv/conf/__pycache__/hook_sample.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/local_files.cpython-34.pyc b/testenv/conf/__pycache__/local_files.cpython-34.pyc deleted file mode 100644 index ab0ee65..0000000 Binary files a/testenv/conf/__pycache__/local_files.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/local_files.cpython-34.pyo b/testenv/conf/__pycache__/local_files.cpython-34.pyo deleted file mode 100644 index ab0ee65..0000000 Binary files a/testenv/conf/__pycache__/local_files.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc deleted file mode 100644 index c16177a..0000000 Binary files a/testenv/conf/__pycache__/local_files.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/local_files.cpython-35.pyc b/testenv/conf/__pycache__/local_files.cpython-35.pyc deleted file mode 100644 index 3fa8c96..0000000 Binary files a/testenv/conf/__pycache__/local_files.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc deleted file mode 100644 index 0c0c0ed..0000000 Binary files a/testenv/conf/__pycache__/local_files.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/reject_header.cpython-34.pyc b/testenv/conf/__pycache__/reject_header.cpython-34.pyc deleted file mode 100644 index 6d20b77..0000000 Binary files a/testenv/conf/__pycache__/reject_header.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/reject_header.cpython-34.pyo b/testenv/conf/__pycache__/reject_header.cpython-34.pyo deleted file mode 100644 index 6d20b77..0000000 Binary files a/testenv/conf/__pycache__/reject_header.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc deleted file mode 100644 index 60645f1..0000000 Binary files a/testenv/conf/__pycache__/reject_header.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/reject_header.cpython-35.pyc b/testenv/conf/__pycache__/reject_header.cpython-35.pyc deleted file mode 100644 index 1044f54..0000000 Binary files a/testenv/conf/__pycache__/reject_header.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc deleted file mode 100644 index ea1e259..0000000 Binary files a/testenv/conf/__pycache__/reject_header.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/response.cpython-34.pyc b/testenv/conf/__pycache__/response.cpython-34.pyc deleted file mode 100644 index ccd6b42..0000000 Binary files a/testenv/conf/__pycache__/response.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/response.cpython-34.pyo b/testenv/conf/__pycache__/response.cpython-34.pyo deleted file mode 100644 index ccd6b42..0000000 Binary files a/testenv/conf/__pycache__/response.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/response.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/response.cpython-35.opt-1.pyc deleted file mode 100644 index daac1f3..0000000 Binary files a/testenv/conf/__pycache__/response.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/response.cpython-35.pyc b/testenv/conf/__pycache__/response.cpython-35.pyc deleted file mode 100644 index 7276035..0000000 Binary files a/testenv/conf/__pycache__/response.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/response.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/response.cpython-36.opt-1.pyc deleted file mode 100644 index 284f616..0000000 Binary files a/testenv/conf/__pycache__/response.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/rule_sample.cpython-34.pyc b/testenv/conf/__pycache__/rule_sample.cpython-34.pyc deleted file mode 100644 index ea27924..0000000 Binary files a/testenv/conf/__pycache__/rule_sample.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/rule_sample.cpython-34.pyo b/testenv/conf/__pycache__/rule_sample.cpython-34.pyo deleted file mode 100644 index ea27924..0000000 Binary files a/testenv/conf/__pycache__/rule_sample.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc deleted file mode 100644 index cfa7508..0000000 Binary files a/testenv/conf/__pycache__/rule_sample.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/rule_sample.cpython-35.pyc b/testenv/conf/__pycache__/rule_sample.cpython-35.pyc deleted file mode 100644 index c6e114f..0000000 Binary files a/testenv/conf/__pycache__/rule_sample.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc deleted file mode 100644 index ed8db47..0000000 Binary files a/testenv/conf/__pycache__/rule_sample.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/send_header.cpython-34.pyc b/testenv/conf/__pycache__/send_header.cpython-34.pyc deleted file mode 100644 index c902811..0000000 Binary files a/testenv/conf/__pycache__/send_header.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/send_header.cpython-34.pyo b/testenv/conf/__pycache__/send_header.cpython-34.pyo deleted file mode 100644 index c902811..0000000 Binary files a/testenv/conf/__pycache__/send_header.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc deleted file mode 100644 index 5ad5ed4..0000000 Binary files a/testenv/conf/__pycache__/send_header.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/send_header.cpython-35.pyc b/testenv/conf/__pycache__/send_header.cpython-35.pyc deleted file mode 100644 index 90b9f74..0000000 Binary files a/testenv/conf/__pycache__/send_header.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc deleted file mode 100644 index 20c9147..0000000 Binary files a/testenv/conf/__pycache__/send_header.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/server_files.cpython-34.pyc b/testenv/conf/__pycache__/server_files.cpython-34.pyc deleted file mode 100644 index 0dd4ca8..0000000 Binary files a/testenv/conf/__pycache__/server_files.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/server_files.cpython-34.pyo b/testenv/conf/__pycache__/server_files.cpython-34.pyo deleted file mode 100644 index 0dd4ca8..0000000 Binary files a/testenv/conf/__pycache__/server_files.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc deleted file mode 100644 index 0b784a6..0000000 Binary files a/testenv/conf/__pycache__/server_files.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/server_files.cpython-35.pyc b/testenv/conf/__pycache__/server_files.cpython-35.pyc deleted file mode 100644 index 23b95ef..0000000 Binary files a/testenv/conf/__pycache__/server_files.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc deleted file mode 100644 index 0fc3f8e..0000000 Binary files a/testenv/conf/__pycache__/server_files.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/urls.cpython-34.pyc b/testenv/conf/__pycache__/urls.cpython-34.pyc deleted file mode 100644 index b3390d6..0000000 Binary files a/testenv/conf/__pycache__/urls.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/urls.cpython-34.pyo b/testenv/conf/__pycache__/urls.cpython-34.pyo deleted file mode 100644 index b3390d6..0000000 Binary files a/testenv/conf/__pycache__/urls.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc deleted file mode 100644 index 40d3bfe..0000000 Binary files a/testenv/conf/__pycache__/urls.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/urls.cpython-35.pyc b/testenv/conf/__pycache__/urls.cpython-35.pyc deleted file mode 100644 index 2342451..0000000 Binary files a/testenv/conf/__pycache__/urls.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc deleted file mode 100644 index 6563b34..0000000 Binary files a/testenv/conf/__pycache__/urls.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/wget_commands.cpython-34.pyc b/testenv/conf/__pycache__/wget_commands.cpython-34.pyc deleted file mode 100644 index c47ac2b..0000000 Binary files a/testenv/conf/__pycache__/wget_commands.cpython-34.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/wget_commands.cpython-34.pyo b/testenv/conf/__pycache__/wget_commands.cpython-34.pyo deleted file mode 100644 index c47ac2b..0000000 Binary files a/testenv/conf/__pycache__/wget_commands.cpython-34.pyo and /dev/null differ diff --git a/testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc b/testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc deleted file mode 100644 index 91e873b..0000000 Binary files a/testenv/conf/__pycache__/wget_commands.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/wget_commands.cpython-35.pyc b/testenv/conf/__pycache__/wget_commands.cpython-35.pyc deleted file mode 100644 index 4011851..0000000 Binary files a/testenv/conf/__pycache__/wget_commands.cpython-35.pyc and /dev/null differ diff --git a/testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc b/testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc deleted file mode 100644 index 68a6491..0000000 Binary files a/testenv/conf/__pycache__/wget_commands.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py index 4e3ace9..98c2e83 100644 --- a/testenv/conf/expected_files.py +++ b/testenv/conf/expected_files.py @@ -24,9 +24,9 @@ class ExpectedFiles: snapshot = {} for parent, dirs, files in os.walk('.'): for name in files: - # pubring.kbx will be created by libgpgme if $HOME doesn't contain the .gnupg directory. - # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here. - if name == 'pubring.kbx': + # pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme if $HOME doesn't contain the .gnupg directory. + # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here. + if name in [ 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]: continue f = {'content': ''} diff --git a/testenv/exc/__pycache__/__init__.cpython-34.pyc b/testenv/exc/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index 85e902c..0000000 Binary files a/testenv/exc/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/__init__.cpython-34.pyo b/testenv/exc/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index 85e902c..0000000 Binary files a/testenv/exc/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index 4bc0c93..0000000 Binary files a/testenv/exc/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/__init__.cpython-35.pyc b/testenv/exc/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 9f985f3..0000000 Binary files a/testenv/exc/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index 5228e11..0000000 Binary files a/testenv/exc/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/server_error.cpython-34.pyc b/testenv/exc/__pycache__/server_error.cpython-34.pyc deleted file mode 100644 index 5f83ebd..0000000 Binary files a/testenv/exc/__pycache__/server_error.cpython-34.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/server_error.cpython-34.pyo b/testenv/exc/__pycache__/server_error.cpython-34.pyo deleted file mode 100644 index 5f83ebd..0000000 Binary files a/testenv/exc/__pycache__/server_error.cpython-34.pyo and /dev/null differ diff --git a/testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc b/testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc deleted file mode 100644 index 6d0f117..0000000 Binary files a/testenv/exc/__pycache__/server_error.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/server_error.cpython-35.pyc b/testenv/exc/__pycache__/server_error.cpython-35.pyc deleted file mode 100644 index c4e9519..0000000 Binary files a/testenv/exc/__pycache__/server_error.cpython-35.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc b/testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc deleted file mode 100644 index 26c4c90..0000000 Binary files a/testenv/exc/__pycache__/server_error.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/test_failed.cpython-34.pyc b/testenv/exc/__pycache__/test_failed.cpython-34.pyc deleted file mode 100644 index 49e49ae..0000000 Binary files a/testenv/exc/__pycache__/test_failed.cpython-34.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/test_failed.cpython-34.pyo b/testenv/exc/__pycache__/test_failed.cpython-34.pyo deleted file mode 100644 index 49e49ae..0000000 Binary files a/testenv/exc/__pycache__/test_failed.cpython-34.pyo and /dev/null differ diff --git a/testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc b/testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc deleted file mode 100644 index eb62bef..0000000 Binary files a/testenv/exc/__pycache__/test_failed.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/test_failed.cpython-35.pyc b/testenv/exc/__pycache__/test_failed.cpython-35.pyc deleted file mode 100644 index 703954f..0000000 Binary files a/testenv/exc/__pycache__/test_failed.cpython-35.pyc and /dev/null differ diff --git a/testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc b/testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc deleted file mode 100644 index 2efd8e4..0000000 Binary files a/testenv/exc/__pycache__/test_failed.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__init__.pyc b/testenv/misc/__init__.pyc deleted file mode 100644 index 09a22d6..0000000 Binary files a/testenv/misc/__init__.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/__init__.cpython-34.pyc b/testenv/misc/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index 7bd020f..0000000 Binary files a/testenv/misc/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/__init__.cpython-34.pyo b/testenv/misc/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index 7bd020f..0000000 Binary files a/testenv/misc/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index 007897a..0000000 Binary files a/testenv/misc/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/__init__.cpython-35.pyc b/testenv/misc/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 4b0c68d..0000000 Binary files a/testenv/misc/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index 9e21cfb..0000000 Binary files a/testenv/misc/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/colour_terminal.cpython-34.pyc b/testenv/misc/__pycache__/colour_terminal.cpython-34.pyc deleted file mode 100644 index 02f4938..0000000 Binary files a/testenv/misc/__pycache__/colour_terminal.cpython-34.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/colour_terminal.cpython-34.pyo b/testenv/misc/__pycache__/colour_terminal.cpython-34.pyo deleted file mode 100644 index 02f4938..0000000 Binary files a/testenv/misc/__pycache__/colour_terminal.cpython-34.pyo and /dev/null differ diff --git a/testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc b/testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc deleted file mode 100644 index 49498b1..0000000 Binary files a/testenv/misc/__pycache__/colour_terminal.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/colour_terminal.cpython-35.pyc b/testenv/misc/__pycache__/colour_terminal.cpython-35.pyc deleted file mode 100644 index 7bdd21e..0000000 Binary files a/testenv/misc/__pycache__/colour_terminal.cpython-35.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc b/testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc deleted file mode 100644 index c752a70..0000000 Binary files a/testenv/misc/__pycache__/colour_terminal.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc b/testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc deleted file mode 100644 index 23f17eb..0000000 Binary files a/testenv/misc/__pycache__/metalinkv3_xml.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc b/testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc deleted file mode 100644 index bd25542..0000000 Binary files a/testenv/misc/__pycache__/metalinkv3_xml.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/wget_file.cpython-34.pyc b/testenv/misc/__pycache__/wget_file.cpython-34.pyc deleted file mode 100644 index 92c6224..0000000 Binary files a/testenv/misc/__pycache__/wget_file.cpython-34.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/wget_file.cpython-34.pyo b/testenv/misc/__pycache__/wget_file.cpython-34.pyo deleted file mode 100644 index 92c6224..0000000 Binary files a/testenv/misc/__pycache__/wget_file.cpython-34.pyo and /dev/null differ diff --git a/testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc b/testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc deleted file mode 100644 index 772b367..0000000 Binary files a/testenv/misc/__pycache__/wget_file.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/wget_file.cpython-35.pyc b/testenv/misc/__pycache__/wget_file.cpython-35.pyc deleted file mode 100644 index c2f7d8d..0000000 Binary files a/testenv/misc/__pycache__/wget_file.cpython-35.pyc and /dev/null differ diff --git a/testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc b/testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc deleted file mode 100644 index 09f3898..0000000 Binary files a/testenv/misc/__pycache__/wget_file.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/misc/colour_terminal.pyc b/testenv/misc/colour_terminal.pyc deleted file mode 100644 index 5a1e29d..0000000 Binary files a/testenv/misc/colour_terminal.pyc and /dev/null differ diff --git a/testenv/server/__init__.pyc b/testenv/server/__init__.pyc deleted file mode 100644 index 2caf9d1..0000000 Binary files a/testenv/server/__init__.pyc and /dev/null differ diff --git a/testenv/server/__pycache__/__init__.cpython-34.pyc b/testenv/server/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index 6a391ed..0000000 Binary files a/testenv/server/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/server/__pycache__/__init__.cpython-34.pyo b/testenv/server/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index 6a391ed..0000000 Binary files a/testenv/server/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index 5fb5e5b..0000000 Binary files a/testenv/server/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/server/__pycache__/__init__.cpython-35.pyc b/testenv/server/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 8346e32..0000000 Binary files a/testenv/server/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index 792905c..0000000 Binary files a/testenv/server/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/server/http/__init__.pyc b/testenv/server/http/__init__.pyc deleted file mode 100644 index 28d4bb7..0000000 Binary files a/testenv/server/http/__init__.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/__init__.cpython-34.pyc b/testenv/server/http/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index 1707f27..0000000 Binary files a/testenv/server/http/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/__init__.cpython-34.pyo b/testenv/server/http/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index 1707f27..0000000 Binary files a/testenv/server/http/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index 3ad8943..0000000 Binary files a/testenv/server/http/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/__init__.cpython-35.pyc b/testenv/server/http/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index b16cf1d..0000000 Binary files a/testenv/server/http/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index a12d3e7..0000000 Binary files a/testenv/server/http/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/http_server.cpython-34.pyc b/testenv/server/http/__pycache__/http_server.cpython-34.pyc deleted file mode 100644 index c7c1543..0000000 Binary files a/testenv/server/http/__pycache__/http_server.cpython-34.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/http_server.cpython-34.pyo b/testenv/server/http/__pycache__/http_server.cpython-34.pyo deleted file mode 100644 index 724c0a9..0000000 Binary files a/testenv/server/http/__pycache__/http_server.cpython-34.pyo and /dev/null differ diff --git a/testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc b/testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc deleted file mode 100644 index 37d360c..0000000 Binary files a/testenv/server/http/__pycache__/http_server.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/http_server.cpython-35.pyc b/testenv/server/http/__pycache__/http_server.cpython-35.pyc deleted file mode 100644 index a6cdf97..0000000 Binary files a/testenv/server/http/__pycache__/http_server.cpython-35.pyc and /dev/null differ diff --git a/testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc b/testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc deleted file mode 100644 index bb3af7b..0000000 Binary files a/testenv/server/http/__pycache__/http_server.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/server/http/http_server.py b/testenv/server/http/http_server.py index ffc80ed..434666d 100644 --- a/testenv/server/http/http_server.py +++ b/testenv/server/http/http_server.py @@ -425,8 +425,16 @@ class _Handler(BaseHTTPRequestHandler): except ServerError as ae: # self.log_error("%s", ae.err_message) if ae.err_message == "Range Overflow": + try: + self.overflows += 1 + except AttributeError as s: + self.overflows = 0 self.send_response(416) + if self.overflows > 0: + self.add_header("Content-Length", 17) self.finish_headers() + if self.overflows > 0: + return("Range Unsatisfied", 0) return(None, None) else: self.range_begin = None diff --git a/testenv/server/http/http_server.pyc b/testenv/server/http/http_server.pyc deleted file mode 100644 index 6576165..0000000 Binary files a/testenv/server/http/http_server.pyc and /dev/null differ diff --git a/testenv/test/__init__.pyc b/testenv/test/__init__.pyc deleted file mode 100644 index 094f3e0..0000000 Binary files a/testenv/test/__init__.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/__init__.cpython-34.pyc b/testenv/test/__pycache__/__init__.cpython-34.pyc deleted file mode 100644 index 4181f2f..0000000 Binary files a/testenv/test/__pycache__/__init__.cpython-34.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/__init__.cpython-34.pyo b/testenv/test/__pycache__/__init__.cpython-34.pyo deleted file mode 100644 index 4181f2f..0000000 Binary files a/testenv/test/__pycache__/__init__.cpython-34.pyo and /dev/null differ diff --git a/testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc b/testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc deleted file mode 100644 index 1e41ebd..0000000 Binary files a/testenv/test/__pycache__/__init__.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/__init__.cpython-35.pyc b/testenv/test/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 0df674b..0000000 Binary files a/testenv/test/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc b/testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc deleted file mode 100644 index 6c48168..0000000 Binary files a/testenv/test/__pycache__/__init__.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/base_test.cpython-34.pyc b/testenv/test/__pycache__/base_test.cpython-34.pyc deleted file mode 100644 index 8e71cea..0000000 Binary files a/testenv/test/__pycache__/base_test.cpython-34.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/base_test.cpython-34.pyo b/testenv/test/__pycache__/base_test.cpython-34.pyo deleted file mode 100644 index 8e71cea..0000000 Binary files a/testenv/test/__pycache__/base_test.cpython-34.pyo and /dev/null differ diff --git a/testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc b/testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc deleted file mode 100644 index ac5d45b..0000000 Binary files a/testenv/test/__pycache__/base_test.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/base_test.cpython-35.pyc b/testenv/test/__pycache__/base_test.cpython-35.pyc deleted file mode 100644 index 1054cb9..0000000 Binary files a/testenv/test/__pycache__/base_test.cpython-35.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc b/testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc deleted file mode 100644 index cbcb033..0000000 Binary files a/testenv/test/__pycache__/base_test.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/http_test.cpython-34.pyc b/testenv/test/__pycache__/http_test.cpython-34.pyc deleted file mode 100644 index ec3e5a9..0000000 Binary files a/testenv/test/__pycache__/http_test.cpython-34.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/http_test.cpython-34.pyo b/testenv/test/__pycache__/http_test.cpython-34.pyo deleted file mode 100644 index 57ba812..0000000 Binary files a/testenv/test/__pycache__/http_test.cpython-34.pyo and /dev/null differ diff --git a/testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc b/testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc deleted file mode 100644 index a87ac21..0000000 Binary files a/testenv/test/__pycache__/http_test.cpython-35.opt-1.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/http_test.cpython-35.pyc b/testenv/test/__pycache__/http_test.cpython-35.pyc deleted file mode 100644 index 37653e4..0000000 Binary files a/testenv/test/__pycache__/http_test.cpython-35.pyc and /dev/null differ diff --git a/testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc b/testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc deleted file mode 100644 index d0d36ed..0000000 Binary files a/testenv/test/__pycache__/http_test.cpython-36.opt-1.pyc and /dev/null differ diff --git a/testenv/test/http_test.pyc b/testenv/test/http_test.pyc deleted file mode 100644 index 2f545be..0000000 Binary files a/testenv/test/http_test.pyc and /dev/null differ diff --git a/tests/Makefile.am b/tests/Makefile.am index 29c113a..15c53c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,5 @@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2011, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/Makefile.in b/tests/Makefile.in index 3a3cd17..1ce41ab 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -15,9 +15,7 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Free Software -# Foundation, Inc. +# Copyright (C) 1995-2011, 2015, 2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -154,7 +152,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -170,28 +169,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -229,17 +229,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -543,6 +544,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -559,6 +561,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -566,6 +569,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -638,6 +642,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -683,6 +688,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -731,6 +737,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -767,6 +774,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -790,7 +798,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -798,6 +808,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -821,6 +832,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -861,6 +873,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -883,12 +896,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -909,6 +924,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -1002,6 +1018,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -1056,13 +1073,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -1079,6 +1100,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1109,6 +1131,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1143,6 +1167,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -1214,6 +1239,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1247,6 +1273,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1285,10 +1312,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1397,6 +1426,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1413,11 +1443,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1426,6 +1459,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1456,6 +1490,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1463,6 +1498,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1473,7 +1510,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/tests/Test-https-badcerts.px b/tests/Test-https-badcerts.px index 68cd142..672cca4 100644 --- a/tests/Test-https-badcerts.px +++ b/tests/Test-https-badcerts.px @@ -43,7 +43,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-clientcert.px b/tests/Test-https-clientcert.px index 36365a5..f0bc739 100755 --- a/tests/Test-https-clientcert.px +++ b/tests/Test-https-clientcert.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-crl.px b/tests/Test-https-crl.px index f5b2f3c..9b04825 100755 --- a/tests/Test-https-crl.px +++ b/tests/Test-https-crl.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-pfs.px b/tests/Test-https-pfs.px index 1fb1c0a..627bd67 100755 --- a/tests/Test-https-pfs.px +++ b/tests/Test-https-pfs.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-selfsigned.px b/tests/Test-https-selfsigned.px index 8d17539..1f48a2b 100755 --- a/tests/Test-https-selfsigned.px +++ b/tests/Test-https-selfsigned.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-tlsv1.px b/tests/Test-https-tlsv1.px index 32ff63a..684cc6a 100755 --- a/tests/Test-https-tlsv1.px +++ b/tests/Test-https-tlsv1.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-tlsv1x.px b/tests/Test-https-tlsv1x.px index 080a9de..37e6ca1 100755 --- a/tests/Test-https-tlsv1x.px +++ b/tests/Test-https-tlsv1x.px @@ -43,7 +43,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") diff --git a/tests/Test-https-weboftrust.px b/tests/Test-https-weboftrust.px index 55f936f..0e8120f 100755 --- a/tests/Test-https-weboftrust.px +++ b/tests/Test-https-weboftrust.px @@ -42,7 +42,7 @@ $ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts"; my $addr = gethostbyname($testhostname); unless ($addr) { - warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n"; + warn "Failed to resolve $testhostname, using $srcdir/certs/wgethosts\n"; exit 77; } unless (inet_ntoa($addr) =~ "127.0.0.1") @@ -99,7 +99,8 @@ my $sslsock = SSLTest->new(cmdline => $cmdline, output => \%expected_downloaded_files, certfile => $usrcrt, keyfile => $usrkey, - lhostname => $testhostname); + lhostname => $testhostname, + sslport => $port); if ($sslsock->run() == 0) { exit 0; diff --git a/tests/certs/interca.conf b/tests/certs/interca.conf index 2d522e7..e0dd100 100644 --- a/tests/certs/interca.conf +++ b/tests/certs/interca.conf @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = /usr/oms/src/wget1.x/tests/certs + dir = /home/thedoctor/Programming/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = interca.crt diff --git a/tests/certs/rootca.conf b/tests/certs/rootca.conf index fd63a44..8148c10 100644 --- a/tests/certs/rootca.conf +++ b/tests/certs/rootca.conf @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = /usr/oms/src/wget1.x/tests/certs + dir = /home/thedoctor/Programming/wget/tests/certs new_certs_dir = ./ unique_subject = no certificate = $dir/test-ca-cert.pem diff --git a/util/Makefile.am b/util/Makefile.am index bf8481b..65b3841 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/util/Makefile.in b/util/Makefile.in index f0a5935..9fddb0b 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -15,8 +15,8 @@ @SET_MAKE@ # Makefile for `wget' utility -# Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,7 +150,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/gnulib-comp.m4 \ $(top_srcdir)/m4/group-member.m4 \ - $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostent.m4 \ + $(top_srcdir)/m4/hard-locale.m4 \ + $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/iconv_h.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \ $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -166,28 +167,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/link.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/locale_h.m4 \ - $(top_srcdir)/m4/localeconv.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/localeconv.m4 \ + $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/md4.m4 \ - $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \ - $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkostemp.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \ - $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ - $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ + $(top_srcdir)/m4/md4.m4 $(top_srcdir)/m4/md5.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ + $(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ + $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netdb_h.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/pipe.m4 $(top_srcdir)/m4/pipe2.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_spawn.m4 \ - $(top_srcdir)/m4/printf.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix_spawn.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/pthread_rwlock_rdlock.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ @@ -225,17 +227,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wait-process.m4 \ - $(top_srcdir)/m4/waitpid.m4 $(top_srcdir)/m4/warn-on-use.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wget.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \ - $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utime.m4 \ + $(top_srcdir)/m4/utime_h.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wait-process.m4 $(top_srcdir)/m4/waitpid.m4 \ + $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wget.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -311,6 +314,7 @@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETADDRINFO_LIB = @GETADDRINFO_LIB@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -327,6 +331,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -334,6 +339,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -406,6 +412,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -451,6 +458,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ @@ -499,6 +507,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_RECV = @GNULIB_RECV@ @@ -535,6 +544,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -558,7 +568,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -566,6 +578,7 @@ GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIME = @GNULIB_UTIME@ GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ @@ -589,6 +602,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -629,6 +643,7 @@ HAVE_BTOWC = @HAVE_BTOWC@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -651,12 +666,14 @@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -677,6 +694,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -770,6 +788,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -824,13 +843,17 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ +HAVE_UTIME = @HAVE_UTIME@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ +HAVE_UTIME_H = @HAVE_UTIME_H@ HAVE_VALGRIND = @HAVE_VALGRIND@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ @@ -847,6 +870,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -877,6 +901,8 @@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HOSTENT_LIB = @HOSTENT_LIB@ +HOST_CPU = @HOST_CPU@ +HOST_CPU_C_ABI = @HOST_CPU_C_ABI@ ICONV_CONST = @ICONV_CONST@ ICONV_H = @ICONV_H@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -911,6 +937,7 @@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ LIBSSL = @LIBSSL@ LIBSSL_PREFIX = @LIBSSL_PREFIX@ +LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBUNISTRING = @LIBUNISTRING@ LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@ @@ -982,6 +1009,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ +NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ @@ -1015,6 +1043,7 @@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ NEXT_SYS_WAIT_H = @NEXT_SYS_WAIT_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ +NEXT_UTIME_H = @NEXT_UTIME_H@ NEXT_WCHAR_H = @NEXT_WCHAR_H@ NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ OBJEXT = @OBJEXT@ @@ -1053,10 +1082,12 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1165,6 +1196,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1181,11 +1213,14 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ REPLACE_USLEEP = @REPLACE_USLEEP@ +REPLACE_UTIME = @REPLACE_UTIME@ REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ @@ -1194,6 +1229,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1224,6 +1260,7 @@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ +UTIME_H = @UTIME_H@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VALGRIND_TESTS = @VALGRIND_TESTS@ @@ -1231,6 +1268,8 @@ VERSION = @VERSION@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1241,7 +1280,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff --git a/util/rmold.pl b/util/rmold.pl index 6ad11e6..a21be99 100755 --- a/util/rmold.pl +++ b/util/rmold.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl -w -# Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011, 2015 -# Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2007-2011, 2015, 2018 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3